新增待办:设计异常,报工bug
This commit is contained in:
@@ -66,8 +66,8 @@ const getDemandInfoFun = async () => {
|
||||
]);
|
||||
const simTypeList: any = commonStore.getDictData(res.data.demandType);
|
||||
tableFormRef.value.setOptionsFun('simType', simTypeList.A);
|
||||
tableFormRef.value.setOptionsFun('workspaceId', [
|
||||
{ label: res.data.workspaceName, value: res.data.workspaceId },
|
||||
tableFormRef.value.setOptionsFun('workspaceCode', [
|
||||
{ label: res.data.workspaceName, value: res.data.workspaceCode },
|
||||
]);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
>
|
||||
<BaseTable
|
||||
ref="tableRef"
|
||||
:api="queryWorkApi"
|
||||
:api="disposeQueryWorkApi"
|
||||
:params="{ taskId: taskInfo.uuid }"
|
||||
showIndex
|
||||
tableName="CREATE_WORK_TIME"
|
||||
@@ -77,10 +77,11 @@ import Dialog from '@/components/common/dialog/index.vue';
|
||||
import { computed, ref } from 'vue';
|
||||
import BaseTable from '@/components/common/table/baseTable.vue';
|
||||
import TableForm from '@/components/common/table/tableForm.vue';
|
||||
import { addWorkApi, queryWorkApi, updateWorkApi } from '@/api/project/work';
|
||||
import { addWorkApi, updateWorkApi } from '@/api/project/work';
|
||||
import { ElMessage } from 'element-plus';
|
||||
import { useDict } from '@/utils/useDict';
|
||||
import { disposeMemberList } from '@/views/task/projectDetail/components/project';
|
||||
import { disposeQueryWorkApi } from '../taskApi';
|
||||
|
||||
const props = defineProps<{
|
||||
showDialog: boolean;
|
||||
|
||||
@@ -237,8 +237,6 @@ const getPageValue = (str: string) => {
|
||||
|
||||
if (str) {
|
||||
for (const key in demandTypeInfo.value) {
|
||||
console.log(key, 'key');
|
||||
|
||||
if (str.includes(key)) {
|
||||
// pageValue.value = demandTypeInfo.value[key];
|
||||
data = demandTypeInfo.value[key];
|
||||
|
||||
@@ -98,6 +98,22 @@ const changeFun = async (val: any) => {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (val.val.key === 'simulationPurpose') {
|
||||
// 1 是异常 0 是正常
|
||||
if (val.val.val.value === '7') {
|
||||
demandRef.value.editFormInfo.designExp = '1';
|
||||
} else {
|
||||
demandRef.value.editFormInfo.designExp = '0';
|
||||
}
|
||||
if (demandRef.value.editFormInfo.extras?.length) {
|
||||
demandRef.value.editFormInfo.extras = demandRef.value.editFormInfo.extras.map((item: any) => {
|
||||
if (item.propertyName === 'designExp') {
|
||||
item.propertyValue = demandRef.value.editFormInfo.designExp;
|
||||
}
|
||||
return item;
|
||||
});
|
||||
}
|
||||
}
|
||||
// }
|
||||
// if (val.type === 'form') {
|
||||
// if (val.val.key === 'demandType') {
|
||||
|
||||
@@ -15,6 +15,7 @@ export const getDemandHideKeys = (key: string) => {
|
||||
'deviceMessage',
|
||||
'materialAndCraftsmanship',
|
||||
'robotNum',
|
||||
'robotNum6',
|
||||
'colorRequirements',
|
||||
'isMoldMaking',
|
||||
'materialNo',
|
||||
@@ -38,7 +39,7 @@ export const getDemandHideKeys = (key: string) => {
|
||||
];
|
||||
keys = allKeys.filter((item) => !industrialKeys.includes(item));
|
||||
} else if (key.indexOf('机器人') !== -1) {
|
||||
const robotKeys = ['robotBrand', 'axis', 'robotNum'];
|
||||
const robotKeys = ['robotBrand', 'axis', 'robotNum', 'robotNum6'];
|
||||
keys = allKeys.filter((item) => !robotKeys.includes(item));
|
||||
} else if (key.indexOf('公差') !== -1) {
|
||||
const toleranceKeys = [''];
|
||||
|
||||
12
src/tenants/lyric/views/task/taskApi.ts
Normal file
12
src/tenants/lyric/views/task/taskApi.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import { queryWorkApi } from '@/api/project/work';
|
||||
|
||||
export const disposeQueryWorkApi = async (params: any) => {
|
||||
const res = await queryWorkApi(params);
|
||||
if (res.code === 200) {
|
||||
res.data.data = res.data.data.map((item: any) => {
|
||||
item.owner = item.ownerStr;
|
||||
return item;
|
||||
});
|
||||
}
|
||||
return res;
|
||||
};
|
||||
Reference in New Issue
Block a user