|
|
@@ -85,17 +85,19 @@
|
|
|
|
|
|
function init() {
|
|
|
getProcessList({
|
|
|
- tenantId: store.tenantId,
|
|
|
+ // tenantId: store.tenantId,
|
|
|
deptId: store.curDeptDetails
|
|
|
}).then(res => {
|
|
|
+ console.log(res)
|
|
|
if (res.code == 200) {
|
|
|
- for (var i = 0; i < res.rows.length; i++) {
|
|
|
+ for (var i = 0; i < res.data.length; i++) {
|
|
|
processList.value[i] = {
|
|
|
- text: res.rows[i].processAlias,
|
|
|
- value: res.rows[i].processId
|
|
|
+ text: res.data[i].processAlias,
|
|
|
+ value: res.data[i].processId
|
|
|
}
|
|
|
};
|
|
|
- selectedProcess.value = res.rows[0].processId;
|
|
|
+
|
|
|
+ selectedProcess.value = res.data[0].processId;
|
|
|
}
|
|
|
})
|
|
|
|
|
|
@@ -117,44 +119,16 @@
|
|
|
};
|
|
|
for (var i = 0; i < equipmentList.value.length; i++) {
|
|
|
equipmentList.value[i] = {
|
|
|
- text: equipmentList.value[i].commonName,
|
|
|
+ text: equipmentList.value[i].commonCode,
|
|
|
value: equipmentList.value[i]
|
|
|
}
|
|
|
};
|
|
|
- selectedEquipment.value = equipmentList.value[0];
|
|
|
- console.log(selectedEquipment.value)
|
|
|
+ selectedEquipment.value = equipmentList.value[0].value;
|
|
|
}
|
|
|
+ baseDialog.value.open()
|
|
|
})
|
|
|
- selectedEquipment.value = equipmentList.value[0];
|
|
|
}
|
|
|
})
|
|
|
- // let reqParam = {
|
|
|
- // userId: userId.value,
|
|
|
- // processId: store.dayworkInfo.currentProcess.id,
|
|
|
- // }
|
|
|
- // getUserequipmentList(reqParam).then(res => {
|
|
|
- // if (res.code == 200) {
|
|
|
- // equipments.value = res.rows
|
|
|
- // getDayWorkItemList({
|
|
|
- // userId: store.userInfo.userId,
|
|
|
- // dayworkId: store.dayworkInfo.id,
|
|
|
- // status: 1
|
|
|
- // }).then(response => {
|
|
|
- // // 过滤人员可选择的设备列表(选择之后不予展示)
|
|
|
- // for (let i = 0; i < response.rows.length; i++) {
|
|
|
- // for (let j = 0; j < equipments.value.length; j++) {
|
|
|
- // if (response.rows[i].equipmentDetailId == equipments.value[j]
|
|
|
- // .equipmentDetailId) {
|
|
|
- // equipments.value.splice(j, 1);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- // console.log(equipments.value)
|
|
|
- // baseDialog.value.open()
|
|
|
- // })
|
|
|
- // }
|
|
|
- // })
|
|
|
- baseDialog.value.open()
|
|
|
}
|
|
|
|
|
|
function open(data) {
|
