diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..6b61791 Binary files /dev/null and b/dist.zip differ diff --git a/src/views/boardGenerate/nodes/form/customFormNode.vue b/src/views/boardGenerate/nodes/form/customFormNode.vue index e69de29..1c54aee 100644 --- a/src/views/boardGenerate/nodes/form/customFormNode.vue +++ b/src/views/boardGenerate/nodes/form/customFormNode.vue @@ -0,0 +1,76 @@ + + + + diff --git a/src/views/boardGenerate/tool.js b/src/views/boardGenerate/tool.js index 278dfba..9074022 100644 --- a/src/views/boardGenerate/tool.js +++ b/src/views/boardGenerate/tool.js @@ -120,5 +120,5 @@ const tool = () => { }; export default tool; export const options = { - isD: true + isD: false }; diff --git a/src/views/dms/dmsBillsFaultInstance/copy.vue b/src/views/dms/dmsBillsFaultInstance/copy.vue index 6e321f6..c7bdc51 100644 --- a/src/views/dms/dmsBillsFaultInstance/copy.vue +++ b/src/views/dms/dmsBillsFaultInstance/copy.vue @@ -403,7 +403,7 @@ const initFormData: DmsBillsFaultInstanceForm = { } -} + const data = reactive>({ form: {...initFormData}, queryParams: { diff --git a/src/views/dms/dmsBillsFaultInstance/index.vue b/src/views/dms/dmsBillsFaultInstance/index.vue index 4b80036..0f1c375 100644 --- a/src/views/dms/dmsBillsFaultInstance/index.vue +++ b/src/views/dms/dmsBillsFaultInstance/index.vue @@ -413,7 +413,7 @@ const initFormData: DmsBillsFaultInstanceForm = { } -} + const data = reactive>({ form: {...initFormData}, queryParams: { diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue index 428f5b5..cf0915b 100644 --- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue +++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue @@ -33,7 +33,7 @@ - + @@ -74,8 +74,8 @@ - { } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') { isUpdate.value = false; } - + // 加载工单实例数据 getDmsBillsLubeInstance(); // 加载工单实例节点数据 @@ -296,16 +296,16 @@ const getDmsBillsLubeInstance = async () => { if (res.rows && res.rows.length > 0) { billsInfo.value = res.rows[0]; planLubeId.value = res.rows[0].planLubeId; - + // 设置工单状态 if (lube_level.value && billsInfo.value.lubeStatus !== undefined) { const statusItem = lube_level.value.find((item: any) => item.value == billsInfo.value.lubeStatus); billsStatusCheck.value = statusItem ? statusItem.label : '未知状态'; } - + // 获取流程定义 getWfprocessActivity(res.rows[0].wfProcessId || 106); - + // 获取润滑计划详情 if (planLubeId.value) { getPlanLubeDetail(); @@ -319,9 +319,9 @@ const getDmsBillsLubeInstance = async () => { // 获取流程定义 const getWfprocessActivity = async (wfProcessId: number) => { try { - const res = await listWfprocessactivity({ wfProcessId }); + // const res = await listWfprocessactivity({ wfProcessId }); wfProcessActivityList.value = res.rows; - + // 更新实例节点名称 if (dmsBillsLubeInstanceActivityList.value.length > 0) { dmsBillsLubeInstanceActivityList.value.forEach(activity => { @@ -333,7 +333,7 @@ const getWfprocessActivity = async (wfProcessId: number) => { } }); } - + // 检查当前用户是否有权限处理 checkUserPermission(); } catch (error) { @@ -359,7 +359,7 @@ const getList = async () => { try { const res = await listDmsBillsLubeInstanceActivity(queryParams); dmsBillsLubeInstanceActivityList.value = res.rows; - + // 填充第一步数据 if (res.rows.length > 0) { Object.assign(form, { @@ -368,7 +368,7 @@ const getList = async () => { lubeLevel: res.rows[0].lubeLevel, remark: res.rows[0].remark }); - + // 初始化下一步表单数据 const lastActivity = res.rows[res.rows.length - 1]; Object.assign(nextStepForm, { @@ -378,7 +378,7 @@ const getList = async () => { processStepOrder: res.rows.length + 1, processHandleResolution: null }); - + currentStepOrder.value = res.rows.length + 1; } } catch (error) { @@ -393,10 +393,10 @@ const checkUserPermission = async () => { if (dmsBillsLubeInstanceActivityList.value.length === wfProcessActivityList.value.length) { try { const hasPermission = await selectUserIdByDmsBillsLubeInstanceActivityId( - lubeInstanceId, + lubeInstanceId, userStore.userId ); - + if (!hasPermission) { proxy?.$modal.alert("您没有权限处理此工单"); // 关闭当前标签页 @@ -418,7 +418,7 @@ const submitForm = async () => { proxy?.$modal.msgError("请填写处理意见"); return; } - + // 设置流程定义ID if (wfProcessActivityList.value.length > 0) { const currentProcess = wfProcessActivityList.value.find( @@ -428,15 +428,15 @@ const submitForm = async () => { nextStepForm.processActivityId = currentProcess.processActivityId; } } - + // 设置其他字段 nextStepForm.processStepOrder = nextStepOrder.value; nextStepForm.wfLength = wfProcessActivityList.value.length; - + // 提交 await addDmsBillsLubeInstanceActivity(nextStepForm); proxy?.$modal.msgSuccess("提交成功"); - + // 重新加载数据 await getList(); } catch (error) { diff --git a/src/views/dms/dmsPlanRepairDetail/copy.vue b/src/views/dms/dmsPlanRepairDetail/copy.vue deleted file mode 100644 index c66eac0..0000000 --- a/src/views/dms/dmsPlanRepairDetail/copy.vue +++ /dev/null @@ -1,310 +0,0 @@ - - - diff --git a/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue b/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue index aa45ecf..bea8459 100644 --- a/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue +++ b/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue @@ -506,17 +506,10 @@ const getMaterialCategorySelect = async () => { mategoryOptions.value = res.data; }; -//获取物料大类下拉框 -let mategoryOptions = ref([]); -const getMaterialCategorySelect = async () => { - const res = await getBaseMaterialCategoryListInWMS(null); - mategoryOptions.value = res.data; -}; defineExpose({tableRef}) onMounted(() => { getMaterialCategorySelect(); getList(); - getMaterialCategorySelect(); }); diff --git a/src/views/wms/allocateOrderDetail/indexbackuo.vue b/src/views/wms/allocateOrderDetail/indexbackuo.vue index 3185664..5eb3ce6 100644 --- a/src/views/wms/allocateOrderDetail/indexbackuo.vue +++ b/src/views/wms/allocateOrderDetail/indexbackuo.vue @@ -216,7 +216,7 @@ const columns = ref([ // aoId: undefined, // allocateOrderCode: undefined, // materialCategoryId: undefined, - materialCategoryName: undefined,//字段映射 +// materialCategoryName: undefined,//字段映射 // planWarehouseId: undefined, // orderStatus: undefined, // targetWarehouseId: undefined,