|
@@ -420,16 +420,8 @@ const getDelegateExcelHtml = async () => {
|
|
//关联材料选择
|
|
//关联材料选择
|
|
const linkSamplingChange = async ({ id, entrustId }, cancelRow) => {
|
|
const linkSamplingChange = async ({ id, entrustId }, cancelRow) => {
|
|
await getDelegateExcelHtml()
|
|
await getDelegateExcelHtml()
|
|
- if (id) {
|
|
|
|
- isCancel.value = false
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
-
|
|
|
|
- await getCancelRow( cancelRow)
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- isCancel.value = true
|
|
|
|
-
|
|
|
|
|
|
+ if (!id) {
|
|
|
|
+ await getCancelRow( cancelRow)
|
|
}
|
|
}
|
|
|
|
|
|
await getDelegateDataInfo(id, entrustId, delegateHtmlForm.value)
|
|
await getDelegateDataInfo(id, entrustId, delegateHtmlForm.value)
|
|
@@ -443,8 +435,12 @@ const linkSamplingChange = async ({ id, entrustId }, cancelRow) => {
|
|
const getCancelRow = async (cancelRow) => {
|
|
const getCancelRow = async (cancelRow) => {
|
|
|
|
|
|
const { error, code, msg, data } = await samplingApi.cancelSample({
|
|
const { error, code, msg, data } = await samplingApi.cancelSample({
|
|
- id: cancelRow.entrustId,
|
|
|
|
- sampleId: cancelRow.id,
|
|
|
|
|
|
+ groupId: cancelRow.entrustId,
|
|
|
|
+ sampleId1: cancelRow.id,
|
|
|
|
+ pkeyId: nodeErTreeId.value,
|
|
|
|
+
|
|
|
|
+ contractId: delegateContractId.value,
|
|
|
|
+
|
|
})
|
|
})
|
|
|
|
|
|
}
|
|
}
|
|
@@ -459,7 +455,7 @@ const getDelegateDataInfo = async (id, entrustId, formData) => {
|
|
contractId: delegateContractId.value,
|
|
contractId: delegateContractId.value,
|
|
nodeId: primaryKeyId,
|
|
nodeId: primaryKeyId,
|
|
formData: JSON.stringify(formData),
|
|
formData: JSON.stringify(formData),
|
|
- isCancel:isCancel.value,
|
|
|
|
|
|
+
|
|
|
|
|
|
})
|
|
})
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
@@ -477,7 +473,6 @@ const delegateHtmlRender = (form) => {
|
|
|
|
|
|
//修改
|
|
//修改
|
|
const editHtmlId = ref('')
|
|
const editHtmlId = ref('')
|
|
-const isCancel = ref(false)//取消选择是true 其他为false
|
|
|
|
|
|
|
|
const rowEdit = async (row) => {
|
|
const rowEdit = async (row) => {
|
|
|
|
|
|
@@ -488,7 +483,7 @@ const rowEdit = async (row) => {
|
|
// delegateContractChange()
|
|
// delegateContractChange()
|
|
row.rowLoad = true
|
|
row.rowLoad = true
|
|
delegateHtmlLoading.value = true
|
|
delegateHtmlLoading.value = true
|
|
- isCancel.value = false
|
|
|
|
|
|
+
|
|
await getDelegateExcelHtml()
|
|
await getDelegateExcelHtml()
|
|
await getDelegateDataInfo('', row.id)
|
|
await getDelegateDataInfo('', row.id)
|
|
|
|
|