diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9b93a8a..4ea2a5d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -73,6 +73,7 @@
processId: '', // 流程实例id
approvalStatus: '', // 审批状态
approvalStatusName: '', // 审批状态名称
+ rejectRemark: '', // 历次原因
})
const companyAddress = ref([]) // 公司地址
const invoiceAddress = ref([]) // 开票地址
@@ -161,6 +162,7 @@
dataForm.value.processId = $route.query.processId as string// 流程实例id
processId.value = $route.query.processId as string// 流程实例id
approvalStatusName.value = $route.query.approvalStatusName as string
+ console.log('---------------', approvalStatusName.value);
taskId.value = $route.query.taskId as string
decisionItem.value = $route.query.decisionItem as string
if (approvalStatusName.value !== '草稿箱') {
@@ -168,6 +170,19 @@
}
getInfo() // 获取详情
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (dataForm.value.rejectRemark) {
+ const lastIndex = dataForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ dataForm.value.rejectRemark = `${dataForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ dataForm.value.rejectRemark = reason
+ }
+}
@@ -190,7 +205,7 @@
关闭
-
+
-
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9b93a8a..4ea2a5d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -73,6 +73,7 @@
processId: '', // 流程实例id
approvalStatus: '', // 审批状态
approvalStatusName: '', // 审批状态名称
+ rejectRemark: '', // 历次原因
})
const companyAddress = ref([]) // 公司地址
const invoiceAddress = ref([]) // 开票地址
@@ -161,6 +162,7 @@
dataForm.value.processId = $route.query.processId as string// 流程实例id
processId.value = $route.query.processId as string// 流程实例id
approvalStatusName.value = $route.query.approvalStatusName as string
+ console.log('---------------', approvalStatusName.value);
taskId.value = $route.query.taskId as string
decisionItem.value = $route.query.decisionItem as string
if (approvalStatusName.value !== '草稿箱') {
@@ -168,6 +170,19 @@
}
getInfo() // 获取详情
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (dataForm.value.rejectRemark) {
+ const lastIndex = dataForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ dataForm.value.rejectRemark = `${dataForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ dataForm.value.rejectRemark = reason
+ }
+}
@@ -190,7 +205,7 @@
关闭
-
+
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 71ebaa6..2a6a60d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,6 +9,7 @@
import type { ISupplier, traceSupplierPerson } from './list_interface'
import showPhoto from '@/views/system/tool/showPhoto.vue'
import { UploadFile } from '@/api/measure/file'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
import { validatePhone } from '@/utils/validate'
import { SCHEDULE } from '@/utils/scheduleDict'
@@ -66,6 +67,7 @@
taxNumber: '',
website: '',
traceSupplierPersonList: [],
+ rejectRemark: '', // 历次驳回记录
})
const isChanged = ref(false)
const companyAddress = ref([]) // 公司地址
@@ -341,6 +343,42 @@
if (pageType.value !== 'add') {
getInfo()
}
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
+const approvalStatusName = ref('')
+onMounted(() => {
+ approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
+})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -576,6 +614,21 @@
+
+
+
+
+
+
+
@@ -614,6 +667,10 @@
+
+
+
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9b93a8a..4ea2a5d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -73,6 +73,7 @@
processId: '', // 流程实例id
approvalStatus: '', // 审批状态
approvalStatusName: '', // 审批状态名称
+ rejectRemark: '', // 历次原因
})
const companyAddress = ref([]) // 公司地址
const invoiceAddress = ref([]) // 开票地址
@@ -161,6 +162,7 @@
dataForm.value.processId = $route.query.processId as string// 流程实例id
processId.value = $route.query.processId as string// 流程实例id
approvalStatusName.value = $route.query.approvalStatusName as string
+ console.log('---------------', approvalStatusName.value);
taskId.value = $route.query.taskId as string
decisionItem.value = $route.query.decisionItem as string
if (approvalStatusName.value !== '草稿箱') {
@@ -168,6 +170,19 @@
}
getInfo() // 获取详情
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (dataForm.value.rejectRemark) {
+ const lastIndex = dataForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ dataForm.value.rejectRemark = `${dataForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ dataForm.value.rejectRemark = reason
+ }
+}
@@ -190,7 +205,7 @@
关闭
-
+
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 71ebaa6..2a6a60d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,6 +9,7 @@
import type { ISupplier, traceSupplierPerson } from './list_interface'
import showPhoto from '@/views/system/tool/showPhoto.vue'
import { UploadFile } from '@/api/measure/file'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
import { validatePhone } from '@/utils/validate'
import { SCHEDULE } from '@/utils/scheduleDict'
@@ -66,6 +67,7 @@
taxNumber: '',
website: '',
traceSupplierPersonList: [],
+ rejectRemark: '', // 历次驳回记录
})
const isChanged = ref(false)
const companyAddress = ref([]) // 公司地址
@@ -341,6 +343,42 @@
if (pageType.value !== 'add') {
getInfo()
}
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
+const approvalStatusName = ref('')
+onMounted(() => {
+ approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
+})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -576,6 +614,21 @@
+
+
+
+
+
+
+
@@ -614,6 +667,10 @@
+
+
+
+
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 42114f0..25b7527 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -98,6 +98,7 @@
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态名称
decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
+ rejectRemark?: string // 历次驳回原因
}
export interface IlistTypes {
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9b93a8a..4ea2a5d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -73,6 +73,7 @@
processId: '', // 流程实例id
approvalStatus: '', // 审批状态
approvalStatusName: '', // 审批状态名称
+ rejectRemark: '', // 历次原因
})
const companyAddress = ref([]) // 公司地址
const invoiceAddress = ref([]) // 开票地址
@@ -161,6 +162,7 @@
dataForm.value.processId = $route.query.processId as string// 流程实例id
processId.value = $route.query.processId as string// 流程实例id
approvalStatusName.value = $route.query.approvalStatusName as string
+ console.log('---------------', approvalStatusName.value);
taskId.value = $route.query.taskId as string
decisionItem.value = $route.query.decisionItem as string
if (approvalStatusName.value !== '草稿箱') {
@@ -168,6 +170,19 @@
}
getInfo() // 获取详情
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (dataForm.value.rejectRemark) {
+ const lastIndex = dataForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ dataForm.value.rejectRemark = `${dataForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ dataForm.value.rejectRemark = reason
+ }
+}
@@ -190,7 +205,7 @@
关闭
-
+
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 71ebaa6..2a6a60d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,6 +9,7 @@
import type { ISupplier, traceSupplierPerson } from './list_interface'
import showPhoto from '@/views/system/tool/showPhoto.vue'
import { UploadFile } from '@/api/measure/file'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
import { validatePhone } from '@/utils/validate'
import { SCHEDULE } from '@/utils/scheduleDict'
@@ -66,6 +67,7 @@
taxNumber: '',
website: '',
traceSupplierPersonList: [],
+ rejectRemark: '', // 历次驳回记录
})
const isChanged = ref(false)
const companyAddress = ref([]) // 公司地址
@@ -341,6 +343,42 @@
if (pageType.value !== 'add') {
getInfo()
}
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
+const approvalStatusName = ref('')
+onMounted(() => {
+ approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
+})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -576,6 +614,21 @@
+
+
+
+
+
+
+
@@ -614,6 +667,10 @@
+
+
+
+
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 42114f0..25b7527 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -98,6 +98,7 @@
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态名称
decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
+ rejectRemark?: string // 历次驳回原因
}
export interface IlistTypes {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index a83a8a3..402cd5e 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -6,6 +6,7 @@
import type { IaddPersonListType, IformInlineType } from './plan_interface'
import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
import DeptSelect from '@/components/DeptSelect/index.vue'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { SCHEDULE } from '@/utils/scheduleDict'
import {
getListDetail,
@@ -45,6 +46,7 @@
trainStaffList: [], // 人员信息
trainTime: '', // 培训时间
processId: '', // 流程实例id, 未通过-驳回编辑使用
+ rejectRemark: '', // 历次驳回记录
})
const processId = ref('') // 未通过-驳回编辑使用
const addId = ref('') // 保存后的id-用于提交
@@ -267,10 +269,40 @@
standard: '',
extarCss: '',
})
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
onMounted(() => {
approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
- processId.value = $route.query.processId as string
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -299,7 +331,7 @@
:model="formInline"
class="demo-form-inline"
:rules="rules"
- label-width="auto"
+ label-width="100px"
label-position="right"
>
@@ -439,6 +471,21 @@
+
+
+
+
+
+
+
@@ -484,6 +531,10 @@
+
+
+
+
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 151081d..8b638f7 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -102,3 +102,13 @@
data,
})
}
+
+// 证书清单导出
+export function certExport(data: { id: string }) {
+ return request({
+ url: `${prefix}/order/cert/export`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 94de1f2..7a5a771 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -496,29 +496,28 @@
}
// 获取详细信息
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
- return {
- ...item,
- certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
- }
- }) // 现场测试、校准或检定人员
- form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- }) // 携带仪器设备
- form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
- form.value.applyPerson = user.id// 申请人
- form.value.applyPersonName = user.name // 申请人名字
- })
+ const res = await getDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
+ return {
+ ...item,
+ certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 现场测试、校准或检定人员
+ form.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ }) // 携带仪器设备
+ form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+ form.value.applyPerson = user.id// 申请人
+ form.value.applyPersonName = user.name // 申请人名字
loading.close()
}
// 打印
@@ -537,7 +536,7 @@
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
if (pageType.value !== 'add') {
- getInfo() // 获取详情
+ await getInfo() // 获取详情
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId)
}
@@ -898,9 +897,9 @@
-
+
增加行
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index f61ee46..4fb0869 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,7 +13,7 @@
import { getDictByCode } from '@/api/system/dict'
import { getUid } from '@/utils/getUid'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, certExport, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
import { printPdf } from '@/utils/printUtils'
import { getUserList } from '@/api/system/user'
@@ -510,6 +510,19 @@
})
}
+// 点击证书清单导出
+const exportCert = () => {
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ const exportTitle = orderType.value === 'measure' ? `检测委托单${dataForm.value.orderCode}样品证书清单` : `校准委托单${dataForm.value.orderCode}样品证书清单`
+ certExport({ id: infoId.value }).then((res) => {
+ exportFile(res.data, `${exportTitle}.xlsx`)
+ loading.close()
+ })
+}
// 点击打印
const printPDF = () => {
const loading = ElLoading.service({
@@ -620,6 +633,9 @@
-->
+
+ 证书清单导出
+
导出
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 2eacf81..2ebb041 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -108,20 +108,17 @@
}
// 获取详情信息
-const getDetail = () => {
+const getDetail = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- detail({ id: $route.params.id as string }).then((res) => {
- loading.close()
- detailForm.value = res.data
- detailForm.value.createUserName = res.data.applicantName || user.name
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
- }).catch(() => {
- loading.close()
+ const res = await detail({ id: $route.params.id as string })
+ loading.close()
+ detailForm.value = res.data
+ detailForm.value.createUserName = res.data.applicantName || user.name
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -396,7 +393,7 @@
await getDict()
detailForm.value.applyProcessId = query.applyProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.applyProcessId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 0360a69..d01f9d1 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -123,20 +123,19 @@
// -----------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
loading.value = true
- detail({ id: infoId.value }).then((res) => {
- loading.value = false
- dataForm.value = res.data
- if (pageType.value == 'detail') {
- fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
- invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
- }
- })
+ const res = await detail({ id: infoId.value })
+ loading.value = false
+ dataForm.value = res.data
+ if (pageType.value == 'detail') {
+ fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+ }
+ else {
+ fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+ invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+ }
}
// 公司地址变化后给对象赋值
@@ -330,12 +329,12 @@
}
}
// ---------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
dataForm.value.processId = query.processId as string // 流程实例id
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(dataForm.value.processId) // 获取审批流程
}
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c848463..a4462c1 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -81,12 +81,11 @@
}
// 获取详情
-const getDetail = () => {
- detail({ id: $route.params.id }).then((res) => {
- detailForm.value = res.data
- list.value = res.data.sampleList.filter((item: ISampleList) => {
- return item !== null
- })
+const getDetail = async () => {
+ const res = await detail({ id: $route.params.id })
+ detailForm.value = res.data
+ list.value = res.data.sampleList.filter((item: ISampleList) => {
+ return item !== null
})
}
@@ -273,12 +272,10 @@
detailForm.value.outsourceReasonName = val[0].outsourceReasonName // 分包原因名称
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
- console.log('00000', query.approvalStatusName)
-
+onMounted(async () => {
detailForm.value.checkProcessId = query.checkProcessId as string // 流程实例
if (pageType.value !== 'add') { // 编辑、详情
- getDetail()
+ await getDetail()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(detailForm.value.checkProcessId) // 获取审批流程
}
diff --git a/src/views/device/borrow/editApply.vue b/src/views/device/borrow/editApply.vue
index 1d156bc..7ebbeee 100644
--- a/src/views/device/borrow/editApply.vue
+++ b/src/views/device/borrow/editApply.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 借用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回日志
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -318,22 +319,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 借用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 借用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -409,7 +409,7 @@
}
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -427,7 +427,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -437,6 +437,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -551,6 +564,21 @@
+
+
+
+
+
+
+
@@ -600,7 +628,7 @@
-
+
{
- acceptanceCheckInfo({ id: infoId.value }).then((res) => {
- // Object.keys(res.data).map((item) => {
- // if (typeof (res.data[item]) === 'number') {
- // res.data[item] = res.data[item].toString()
- // }
- // })
- checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
- checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
- formInline.value = res.data
- formInline.value.equipmentList = res.data.checkList
- formInline.value.applyType = '9'
- formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
- formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
- })
+const getInfo = async () => {
+ const res = await acceptanceCheckInfo({ id: infoId.value })
+ // Object.keys(res.data).map((item) => {
+ // if (typeof (res.data[item]) === 'number') {
+ // res.data[item] = res.data[item].toString()
+ // }
+ // })
+ checkIdObject.value.applyNo = res.data.checkApplyNo // 申请编号
+ checkIdObject.value.applyName = res.data.checkApplyName // 申请名称
+ formInline.value = res.data
+ formInline.value.equipmentList = res.data.checkList
+ formInline.value.applyType = '9'
+ formInline.value.applyUnit = res.data.deptId || user.deptId // 申请单位
+ formInline.value.applyUnitName = res.data.deptName || user.deptName // 申请单位名称
}
const fileRef = ref() // 文件上传input
@@ -365,10 +365,22 @@
formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
// 编辑和详情页面获取详情信息
if (pageType.value !== 'add') {
- getInfo() // 获取详情信息
+ await getInfo() // 获取详情信息
getApprovalRecord(formInline.value.processId) // 获取审批流程
}
})
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -508,6 +520,21 @@
+
+
+
+
+
+
+
@@ -544,7 +571,7 @@
-
+
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3400bca..9507828 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -74,6 +74,7 @@
time: '',
updateTime: '', // 更新时间
version: '', // 版本号
+ rejectRemark: '', // 历次驳回记录
})
// 审批弹窗开关
@@ -173,25 +174,22 @@
const SelectionList = ref([])
// 获取详情信息
-const getInfo = () => {
- equipmentApplyInfo({ id: infoId.value }).then((res) => {
- Object.keys(res.data).map((item) => {
- if (typeof (res.data[item]) === 'number') {
- res.data[item] = res.data[item].toString()
- }
- })
- formInline.value = res.data
- formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
- return {
- ...item,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
+const getInfo = async () => {
+ const res = await equipmentApplyInfo({ id: infoId.value })
+ Object.keys(res.data).map((item) => {
+ if (typeof (res.data[item]) === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ formInline.value = res.data
+ formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
})
}
-if (pageType.value !== 'add') {
- getInfo()
-}
+
// 保存后的id
const addId = ref('')
@@ -415,17 +413,33 @@
formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
await fetchUserList()
await fetchDeptTreeList()
+
formInline.value.processId = $route.params.processId as string // 任务id
decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
taskId.value = $route.query.taskId as string // 流程实例id
approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
console.log(approvalStatusName.value)
-
+ if (pageType.value !== 'add') {
+ await getInfo()
+ }
formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
if (formInline.value.approvalStatusName !== '草稿箱') {
getApprovalRecord(formInline.value.processId) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -552,6 +566,21 @@
+
+
+
+
+
+
+
@@ -591,7 +620,7 @@
-
+
@@ -599,7 +628,7 @@
:dialog-select-divice-visible="dialogSelectDiviceVisible"
:is-multi="true"
@close-dialog="closeDialog"
- @updateDeviceConfirm="confirmSelectDevice"
+ @update-device-confirm="confirmSelectDevice"
/>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index dbf4a96..6071545 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -62,6 +62,7 @@
applyPersonName: '', // 申请人名称
time: '', // 领用时间
applyDesc: '', // 申请说明
+ rejectRemark: '', // 历次驳回申请
})
const ruleFormRef = ref() as any
const list = ref([])// 表格数据
@@ -282,22 +283,21 @@
}
// 编辑、详情--获取详细信息
-const fetchReceiveApplyListDetail = () => {
- getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
- form.value.applyUnit = res.data.applyUnit // 部门
- form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
- form.value.applyName = res.data.applyName // 申请名称
- form.value.applyPerson = res.data.applyPerson// 申请人
- form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
- form.value.applyNo = res.data.applyNo// 申请编号
- form.value.time = res.data.time // 领用时间
- form.value.applyDesc = res.data.applyDesc // 申请说明
- list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
- return {
- ...item,
- validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
- }
- })
+const fetchReceiveApplyListDetail = async () => {
+ const res = await getReceiveApplyListDetail({ id: form.value.id })
+ form.value.applyUnit = res.data.applyUnit // 部门
+ form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
+ form.value.applyName = res.data.applyName // 申请名称
+ form.value.applyPerson = res.data.applyPerson// 申请人
+ form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+ form.value.applyNo = res.data.applyNo// 申请编号
+ form.value.time = res.data.time // 领用时间
+ form.value.applyDesc = res.data.applyDesc // 申请说明
+ list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+ return {
+ ...item,
+ validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+ }
})
}
@@ -374,7 +374,7 @@
}
// --------------------------------------------------------------------------------------
-onMounted(() => {
+onMounted(async () => {
typeValue.value = $route.query.typeValue // 类型add、edit、detail
form.value.id = $route.query.id as string // id
form.value.taskId = $route.query.taskId as string // 任务id
@@ -391,7 +391,7 @@
form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
// 编辑、详情获取详情页信息
if (typeValue.value === 'edit' || typeValue.value === 'detail') {
- fetchReceiveApplyListDetail() // 获取详细信息
+ await fetchReceiveApplyListDetail() // 获取详细信息
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(form.value.processId) // 查询审批记录
@@ -401,6 +401,19 @@
// 获取人员列表--申请人使用
fetchUserList()
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (form.value.rejectRemark) {
+ const lastIndex = form.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ form.value.rejectRemark = `${form.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ form.value.rejectRemark = reason
+ }
+}
@@ -515,6 +528,21 @@
+
+
+
+
+
+
+
@@ -564,7 +592,7 @@
-
+
{
+const getInfo = async (id: string | number) => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getStandardLisdetali({ id }).then((res) => {
- // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
- Object.keys(res.data).map((item) => {
- if (typeof res.data[item] === 'number') {
- res.data[item] = res.data[item].toString()
+ const res = await getStandardLisdetali({ id })
+ // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
+ Object.keys(res.data).map((item) => {
+ if (typeof res.data[item] === 'number') {
+ res.data[item] = res.data[item].toString()
+ }
+ })
+ // 给数据对象赋值
+ formInline.value = res.data.meterStandardEquipment
+ // 拿到当前的标准设备id
+ // fromListInfo.value.standardEquipmentId = res.data.id
+ fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
+ tableId.value = res.data.standardEquipmentId
+ // 拿到当前的设备信息
+ // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+ // 需要更换的表格
+ if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
+ fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ supportEquipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
}
})
- // 给数据对象赋值
- formInline.value = res.data.meterStandardEquipment
- // 拿到当前的标准设备id
- // fromListInfo.value.standardEquipmentId = res.data.id
- fromListInfo.value.standardEquipmentId = res.data.standardEquipmentId
- tableId.value = res.data.standardEquipmentId
- // 拿到当前的设备信息
- // fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
- // 需要更换的表格
- if (res.data.oldSupportEquipmentList && res.data.oldSupportEquipmentList.length) {
- fromListInfo.value.fixedAssetsList = res.data.oldSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- supportEquipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- // 更换为的表格
- if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
- fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
- return {
- ...item,
- id: '',
- equipmentId: item.id,
- validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
- }
- })
- }
- formInline.value.applyNo = res.data.applyNo // 申请编号
- formInline.value.applyName = res.data.applyName // 申请名称
- formInline.value.applyTime = res.data.applyTime // 申请时间
- formInline.value.applyUnit = res.data.applyUnit // 申请单位
- formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
- formInline.value.applyPerson = res.data.applyPerson // 申请人
- formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
- formInline.value.fileList = res.data.fileList // 文件列表
- formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
- loading.close()
- })
+ }
+ // 更换为的表格
+ if (res.data.newSupportEquipmentList && res.data.newSupportEquipmentList.length) {
+ fromListInfo.value.newFixedAssetsList = res.data.newSupportEquipmentList.map((item: any) => {
+ return {
+ ...item,
+ id: '',
+ equipmentId: item.id,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+ }
+ })
+ }
+ formInline.value.applyNo = res.data.applyNo // 申请编号
+ formInline.value.applyName = res.data.applyName // 申请名称
+ formInline.value.applyTime = res.data.applyTime // 申请时间
+ formInline.value.applyUnit = res.data.applyUnit // 申请单位
+ formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+ formInline.value.applyPerson = res.data.applyPerson // 申请人
+ formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+ formInline.value.fileList = res.data.fileList // 文件列表
+ formInline.value.applyName = `标准装置${$route.query.routeMetaTitle}` // 申请名称固定
+ loading.close()
}
// 提交
@@ -807,12 +808,25 @@
infoId.value = $route.query.id as string
// 编辑、详情获取详情信息
if (pageType.value !== 'add') {
- getInfo(infoId.value)
+ await getInfo(infoId.value)
}
if (approvalStatusName.value !== '草稿箱') {
getApprovalRecord(processId.value) // 查询审批记录
}
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -1304,6 +1318,21 @@
+
+
+
+
+
+
+
@@ -1422,7 +1451,7 @@
-
+
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 471f8cb..068b77c 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -167,6 +167,7 @@
transmitRange: string // 传递范围
transmitRangeName: string // 传递范围名称
uncertainty: string // 不确定度
+ rejectRemark?: string // 历次驳回原因
}
export interface IApplyEquipmentList {
@@ -240,4 +241,5 @@
minioFileName: any // 附件名称数组
newSupportEquipmentList: IApplyEquipmentList[] // 替换后的设备列表
oldSupportEquipmentList: IApplyEquipmentList[] // 需要被替换的设备列表
+ rejectRemark?: string // 历次驳回原因
}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3ea677c..726a2a7 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -55,6 +55,7 @@
equipmentId: '',
equipmentList: [] as EquipmentListRow[],
id: '',
+ rejectRemark: '', // 历次驳回原因
})
const rules1 = ref({
@@ -380,6 +381,19 @@
taskId.value = $route.query.taskId as string // 流程实例id
_approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (ruleForm.value.rejectRemark) {
+ const lastIndex = ruleForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ ruleForm.value.rejectRemark = `${ruleForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ ruleForm.value.rejectRemark = reason
+ }
+}
@@ -524,18 +538,33 @@
+
+
+
+
+
+
+
-
+
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index cbcc666..8eeb0d9 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -378,32 +378,31 @@
}
// -------------------------------------------------------------------------------------
// 获取详情
-const getInfo = () => {
+const getInfo = async () => {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
- getContractDetail({ id: infoId.value }).then((res) => {
- form.value = res.data
- form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
- // 委托单
- orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
- return {
- ...item,
- isUrgentName: item.isUrgent == 1 ? '是' : '否',
- finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
- }
- })
- // 收款信息
- paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
- return {
- ...item,
- estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
- actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
- }
- })
- loading.close()
+ const res = await getContractDetail({ id: infoId.value })
+ form.value = res.data
+ form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
+ // 委托单
+ orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
+ return {
+ ...item,
+ isUrgentName: item.isUrgent == 1 ? '是' : '否',
+ finishStatusName: item.statusName === '检测完成' ? '已完成' : '未完成',
+ }
})
+ // 收款信息
+ paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
+ return {
+ ...item,
+ estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
+ actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
+ }
+ })
+ loading.close()
}
// 保存
@@ -512,7 +511,7 @@
form.value.createUserName = user.name // 申请人名称
// 非添加页面获取详情
if (pageType.value !== 'add') {
- getInfo()
+ await getInfo()
if (query.approvalStatusName !== '草稿箱') {
getApprovalRecord(form.value.processId) // 获取审批流程
}
@@ -530,6 +529,7 @@
else {
form.value.rejectRemark = reason
}
+ console.log('okk55555555555oko', form.value.rejectRemark)
}
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index dad77d6..bdc7583 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -12,6 +12,9 @@
type: Object as PropType,
required: true,
},
+ approvalStatusName: {
+ type: String,
+ },
})
const companyAddress = computed(() => {
return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
@@ -235,6 +238,21 @@
+
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 4b3b7bf..3cecfb6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -246,7 +246,10 @@
}
// 驳回后编辑
function editAgain(row: Omit) {
- $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
+ $router.push({
+ path: `/source/edit/${row.id}/${row.processId}?from=reject`,
+ query: { ...row },
+ })
}
// 提交
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9b93a8a..4ea2a5d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -73,6 +73,7 @@
processId: '', // 流程实例id
approvalStatus: '', // 审批状态
approvalStatusName: '', // 审批状态名称
+ rejectRemark: '', // 历次原因
})
const companyAddress = ref([]) // 公司地址
const invoiceAddress = ref([]) // 开票地址
@@ -161,6 +162,7 @@
dataForm.value.processId = $route.query.processId as string// 流程实例id
processId.value = $route.query.processId as string// 流程实例id
approvalStatusName.value = $route.query.approvalStatusName as string
+ console.log('---------------', approvalStatusName.value);
taskId.value = $route.query.taskId as string
decisionItem.value = $route.query.decisionItem as string
if (approvalStatusName.value !== '草稿箱') {
@@ -168,6 +170,19 @@
}
getInfo() // 获取详情
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (dataForm.value.rejectRemark) {
+ const lastIndex = dataForm.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ dataForm.value.rejectRemark = `${dataForm.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ dataForm.value.rejectRemark = reason
+ }
+}
@@ -190,7 +205,7 @@
关闭
-
+
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 71ebaa6..2a6a60d 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,6 +9,7 @@
import type { ISupplier, traceSupplierPerson } from './list_interface'
import showPhoto from '@/views/system/tool/showPhoto.vue'
import { UploadFile } from '@/api/measure/file'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { failUpdateSourceApproval, getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
import { validatePhone } from '@/utils/validate'
import { SCHEDULE } from '@/utils/scheduleDict'
@@ -66,6 +67,7 @@
taxNumber: '',
website: '',
traceSupplierPersonList: [],
+ rejectRemark: '', // 历次驳回记录
})
const isChanged = ref(false)
const companyAddress = ref([]) // 公司地址
@@ -341,6 +343,42 @@
if (pageType.value !== 'add') {
getInfo()
}
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
+const approvalStatusName = ref('')
+onMounted(() => {
+ approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
+})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -576,6 +614,21 @@
+
+
+
+
+
+
+
@@ -614,6 +667,10 @@
+
+
+
+
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 42114f0..25b7527 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -98,6 +98,7 @@
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态名称
decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
+ rejectRemark?: string // 历次驳回原因
}
export interface IlistTypes {
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index a83a8a3..402cd5e 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -6,6 +6,7 @@
import type { IaddPersonListType, IformInlineType } from './plan_interface'
import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
import DeptSelect from '@/components/DeptSelect/index.vue'
+import { cancelApproval, fetchApproval } from '@/api/approval'
import { SCHEDULE } from '@/utils/scheduleDict'
import {
getListDetail,
@@ -45,6 +46,7 @@
trainStaffList: [], // 人员信息
trainTime: '', // 培训时间
processId: '', // 流程实例id, 未通过-驳回编辑使用
+ rejectRemark: '', // 历次驳回记录
})
const processId = ref('') // 未通过-驳回编辑使用
const addId = ref('') // 保存后的id-用于提交
@@ -267,10 +269,40 @@
standard: '',
extarCss: '',
})
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+ if (processId) {
+ fetchApproval(processId).then((res) => {
+ approvalRecordData.value = res.data
+ })
+ }
+ else {
+ ElMessage.warning('流程实例id为空')
+ }
+}
+
onMounted(() => {
approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
- processId.value = $route.query.processId as string
+ formInline.value.processId = $route.query.processId as string// 流程实例id
+ processId.value = $route.query.processId as string// 流程实例id
+ if (approvalStatusName.value !== '草稿箱') {
+ getApprovalRecord(formInline.value.processId) // 查询审批记录
+ }
})
+
+// 监听到驳回原因
+const giveRejectRemark = (reason: string) => {
+ if (formInline.value.rejectRemark) {
+ const lastIndex = formInline.value.rejectRemark.lastIndexOf(reason)
+ if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接
+ formInline.value.rejectRemark = `${formInline.value.rejectRemark};${reason}`
+ }
+ }
+ else {
+ formInline.value.rejectRemark = reason
+ }
+}
@@ -299,7 +331,7 @@
:model="formInline"
class="demo-form-inline"
:rules="rules"
- label-width="auto"
+ label-width="100px"
label-position="right"
>
@@ -439,6 +471,21 @@
+
+
+
+
+
+
+
@@ -484,6 +531,10 @@
+
+
+
+
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index bb329e1..e0c741c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -146,6 +146,7 @@
trainStaffList: IaddPersonListType[] // 人员信息
trainTime: string // 培训时间
processId?: string // 流程实例id
+ rejectRemark: string // 历次驳回记录
}
// 培训计划审批