|
@@ -148,9 +148,9 @@ import {ref, onMounted, watch} from "vue";
|
|
import {useAppStore} from "~src/store";
|
|
import {useAppStore} from "~src/store";
|
|
import HcDragUpload from "./components/HcDragUpload.vue"
|
|
import HcDragUpload from "./components/HcDragUpload.vue"
|
|
import HcSelectTree from "./components/HcSelectTree.vue"
|
|
import HcSelectTree from "./components/HcSelectTree.vue"
|
|
-import {getClassList, queryDeviceList, querySampleList} from "~api/tentative";
|
|
|
|
|
|
+import {getClassList, queryDeviceList, querySampleList,getSampleInfo} from "~api/tentative";
|
|
import {getContractUserList} from "~api/other";
|
|
import {getContractUserList} from "~api/other";
|
|
-import {formValidate, getArrValue} from "vue-utils-plus"
|
|
|
|
|
|
+import {formValidate, getArrValue,getObjValue} from "vue-utils-plus"
|
|
import dataApi from "~api/tentative/device/employ";
|
|
import dataApi from "~api/tentative/device/employ";
|
|
import {getRowsValue, rowsToId} from "~uti/tools";
|
|
import {getRowsValue, rowsToId} from "~uti/tools";
|
|
|
|
|
|
@@ -532,17 +532,20 @@ const nodeMaterialLoading = ref(false)
|
|
const nodeMaterialSelectData = ref([])
|
|
const nodeMaterialSelectData = ref([])
|
|
const nodeMaterialChange = async (val) => {
|
|
const nodeMaterialChange = async (val) => {
|
|
nodeMaterialLoading.value = true
|
|
nodeMaterialLoading.value = true
|
|
- const {data} = await querySampleList({
|
|
|
|
- projectId: projectId.value,
|
|
|
|
- contractId: contractId.value,
|
|
|
|
- nodeId: val
|
|
|
|
|
|
+ // const {data} = await querySampleList({
|
|
|
|
+ // projectId: projectId.value,
|
|
|
|
+ // contractId: contractId.value,
|
|
|
|
+ // nodeId: val
|
|
|
|
+ // })
|
|
|
|
+ const {data} = await getSampleInfo({
|
|
|
|
+ primaryKeyId: val
|
|
})
|
|
})
|
|
//处理数据
|
|
//处理数据
|
|
- const records = getArrValue(data)
|
|
|
|
|
|
+ const records = getObjValue(data)
|
|
nodeMaterialSelectData.value = records
|
|
nodeMaterialSelectData.value = records
|
|
if (records.length > 0) {
|
|
if (records.length > 0) {
|
|
- addEditFormModel.value.specificationNumber = records[0].specificationNumber
|
|
|
|
- addEditFormModel.value.materialName = records[0].materialName
|
|
|
|
|
|
+ addEditFormModel.value.specificationNumber = records?.sampleNames
|
|
|
|
+ addEditFormModel.value.materialName = records?.sampleNumbers
|
|
} else {
|
|
} else {
|
|
addEditFormModel.value.specificationNumber = ''
|
|
addEditFormModel.value.specificationNumber = ''
|
|
addEditFormModel.value.materialName = ''
|
|
addEditFormModel.value.materialName = ''
|