diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index a5ea1df..0b7a3b9 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -35,7 +35,7 @@
查看
接单
+ @click="takeOrders(row)">{{row.status == 400 ? '派单' : '接单'}}
关闭
确认
@@ -309,7 +309,7 @@
-
+
{ changeProduct(val, scope.$index) })"
@blur="((val) => { changeProduct(val, scope.$index) })" v-loadmore="loadmoreProduct"
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index 14a36ec..a0defab 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -208,7 +208,7 @@
-
+
diff --git a/src/views/labManagement/components/addDialog.vue b/src/views/labManagement/components/addDialog.vue
index 99467f8..20a0dbe 100644
--- a/src/views/labManagement/components/addDialog.vue
+++ b/src/views/labManagement/components/addDialog.vue
@@ -169,6 +169,7 @@ export default {
watch: {
detailForm(newVal, oldVal) {
if (JSON.stringify(newVal) != '{}') {
+ console.log('JSON.stringify(newVal)---------------------->',JSON.stringify(newVal))
this.deviceList = []
this.detailForm = newVal
this.addForm = {
@@ -192,7 +193,7 @@ export default {
this.drawfiles = []
this.filesList = this.detailForm.attaches
this.imgList = this.detailForm.attaches
- this.detailForm.draws.map(item => {
+ this.detailForm.draws && this.detailForm.draws.length != 0 && this.detailForm.draws.map(item => {
this.drawList.push({
name: item.name,
url: item.link
@@ -245,9 +246,9 @@ export default {
this.floorArr = []
this.roomArr = []
this.tableData = this.getDeepCode(this.detailForm.details, [])
- this.changeUnit(this.detailForm.deptId)
+ this.detailForm.deptId && this.changeUnit(this.detailForm.deptId)
- this.detailForm.attaches.map(item => {
+ this.detailForm.attaches && this.detailForm.attaches.length != 0 && this.detailForm.attaches.map(item => {
this.imgList.push({
name: item.name,
url: item.link
@@ -257,7 +258,7 @@ export default {
url: item.link
})
})
- this.detailForm.draws.map(item => {
+ this.detailForm.draws && this.detailForm.draws.length != 0 && this.detailForm.draws.map(item => {
this.drawList.push({
name: item.name,
url: item.link
@@ -277,7 +278,7 @@ export default {
},
methods: {
getDeepCode(data, arr) {
- data.map(item => {
+ data && data.length != 0 && data.map(item => {
if (item.details.length != 0) {
this.getDeepCode(item.details, arr)
} else {
@@ -456,17 +457,14 @@ export default {
},
// 切换实验室
changeUnit(val) {
- console.log('val===========>', val)
- console.log('unitData===============>', this.unitData)
this.labId = val
if (this.title == '新建') {
- this.addForm.unitName = this.unitData.find(item => item.id == val).title
+ this.addForm.unitName = this.unitData.find(item => item.id == val) ? this.unitData.find(item => item.id == val).title : ''
this.deviceList.map(item => {
item.disabled = false
})
}
getDeepData({ parentId: val }).then(res => {
- console.log('res ------------------->', res)
this.floorArr = res.data.data
this.activeFloor = res.data.data.length > 0 ? res.data.data[0].id : ''
getDeepData({ parentId: this.activeFloor }).then(res => {
@@ -476,13 +474,11 @@ export default {
if (JSON.stringify(this.detailForm) != '{}') {
console.log(this.activeFloor, this.activeRoom)
this.addForm.tableData = this.tableData.filter(item => item.floorId == this.activeFloor && item.deptId == this.activeRoom)
- console.log('addForm==========>', this.addForm.tableData)
let arr1 = this.deviceList.filter(item1 =>
this.addForm.tableData.some(item2 =>
item1.id == item2.deviceId
)
);
- console.log('arr1==============>', arr1)
this.deviceList.map(item1 => {
item1.disabled = false
arr1.map(item2 => {
diff --git a/src/views/labManagement/inspectionManagement.vue b/src/views/labManagement/inspectionManagement.vue
index fee50cd..76885bb 100644
--- a/src/views/labManagement/inspectionManagement.vue
+++ b/src/views/labManagement/inspectionManagement.vue
@@ -441,7 +441,6 @@ export default {
},
handleView(row) {
getPlanDetail({ id: row.id }).then(res => {
- console.log('res==============>', res)
this.dialogTitle = '查看'
if (res.data.code == 200) {
this.detailForm = res.data.data
@@ -474,10 +473,9 @@ export default {
getLeftLab() {
getLimsTree().then(res => {
- console.log('res==============>', res)
this.treeData = res.data.data
- this.unitData = res.data.data.filter(item => item.parentId == 0)
- console.log('unitData============>', this.unitData)
+ // this.unitData = res.data.data.filter(item => item.parentId == 0)
+ this.unitData = res.data.data
})
},
nodeClick(data) {