diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 636560369..89b4d112c 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -53,7 +53,7 @@
- 工序编码：{{currentNode.id}} -工序名称:{{currentNode.attrs.title.text }} + 工序编码：{{currentNode.id}} -工序名称:{{currentNode.name }} @@ -70,7 +70,7 @@ - + @@ -89,6 +89,17 @@ + 添加人员 @@ -262,13 +273,15 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const graphJson =ref() const currentNode = ref({ - attrs:{ - title:{ - text:'' - } - }, + name:'', id:'' }) +const showMaterialsData=ref() //物料信息分页展示 +const page=ref({ + total:0, + current:1, + size:5 +}) /*班组数据*/ const teamData = ref([]) /*班组弹窗搜索条件*/ @@ -314,12 +327,15 @@ const searchTeamList = () => { } /** 打开弹窗 */ const open = async (type: string, row?: any, titleName?: any) => { - currentNode.value.attrs.title.text='' + currentNode.value.name='' currentNode.value.id='' //首次打开页面，将数据清空 workerData.value = [] equipmentData.value = [] materialsData.value = [] + showMaterialsData.value=[] + page.value.total = 0 + page.value.current = 1 workstationData.value = [] getOptions() dialogVisible.value = true @@ -377,14 +393,27 @@ const getProcessBom=async (code:any) => { queryParams.processCode=code let res = await orderDayconfigApi.getOrderDayBomByOrder(queryParams) materialsData.value=res + if(materialsData.value.length>0){ + page.value.total = materialsData.value.length + page.value.current = 1 + showMaterialsData.value=materialsData.value.slice(0,page.value.size) + } } +// const currentStartNode = ref({ +// id:'' +// }) //获取配置的工艺路线信息 const getProcessroute = async () => { let res = await orderDayconfigApi.getConfigProcessRoute(queryParams) - //console.log('ddddd',res) graphJson.value=JSON.parse(res.newGraphData) - graph.value?.fromJSON(graphJson.value.cells) + //首次打开弹窗，默认打开一个工序的数据 + //currentStartNode.value = graphJson.value.cells[0] + currentNode.value = graphJson.value.cells[0] + // 手动触发点击事件 + nodeClick('','','',currentNode.value,'') + + } //获取配置的工序信息 const getConfigProcessRouteNode= async () => { @@ -407,12 +436,15 @@ const getConfigProcessEquipment= async (code:any) => { equipmentData.value = await orderDayconfigApi.getConfigProcessEquipment(queryParams) } const nodeClick = (e, x, y, node, view) => { + //console.log(node.id) getProcessBom(node.id) getConfigProcessWorkstation(node.id) getConfigProcessWorker(node.id) getConfigProcessEquipment(node.id) processCode.value = node.id - currentNode.value=node + currentNode.value.id=node.id + //console.log(node) + currentNode.value.name=node.attrs.title.text } const searchTableRef = ref() @@ -481,14 +513,14 @@ const doPublishPlan= ()=>{ } let res = OrderDayApi.publishPlan(data) - + res.then(()=>{ message.success("计划发布成功") }).catch(()=>{ //console.log("---doPublishPlan-- 458--",res.msg) message.error("计划发布失败！") }) - + } // 弹层确定返回所选数据 @@ -654,7 +686,7 @@ const opensearchTableEquipment = async ( /*设备保存接口*/ const saveEquipment = async () =>{ await orderDayconfigApi.saveEquipment(equipmentData.value) - console.log(equipmentData.value) + //console.log(equipmentData.value) message.success("设备配置成功！") } @@ -678,7 +710,25 @@ const saveUser = async () =>{ const getTeamList = async (params:any) => { return TeamApi.getTeamPage(params) } - +const handleCurrentChangeM=(value: number)=>{ + let index=(value-1)*page.value.size + page.value.current=value + showMaterialsData.value=materialsData.value.slice(index,index+page.value.size) + +} +const handlePrevClickM=(value: number)=>{ + page.value.current=value-1 + if(page.value.current==0) { + page.value.current=1 + } + +} +const handleNextClickM=(value: number)=>{ + page.value.current=value+1 + if(page.value.current>page.value.total/page.value.size) { + page.value.current=page.value.total/page.value.size -1 + } +} defineOptions({ name: 'SechledDetail' }) defineExpose({ open }) // 提供 open 方法，用于打开弹窗 // 传递给父类 diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index c10f2af27..571e045fb 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -12,8 +12,8 @@
- {{ titleValueRef }} - [{{ titleNameRef }}] + {{ titleNameRef }} + [{{ titleValueRef }}] @@ -37,7 +37,7 @@ >添加工序
- + @@ -48,6 +48,17 @@ +
@@ -81,8 +92,9 @@ 工艺路线基本信息 -

工艺路线名称：{{ productData.name }}

-

工艺路线编码：{{ productData.name }}

+ +

工艺路线名称：{{titleNameRef}}

+

工艺路线编码：{{titleValueRef}}

产品名称：{{ productData.name }}

产品编码：{{ productData.code }}

产品描述：{{ productData.desc1 }}

@@ -92,23 +104,34 @@ > - + + @@ -121,7 +144,7 @@ > @@ -154,6 +177,7 @@ const message = useMessage() // 消息弹窗 //const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() +const currentNode=ref({code:'',name:''}) routeName.value = route.name routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'ProcessRouteConfig' //const updateKey = ref(0) @@ -165,6 +189,22 @@ const tableProcess = ref() const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据 const materialData=ref() const mouldData = ref() +const page=ref({ + total:0, + current:1, + size:5 +}) +const pageM=ref({ + total:0, + current:1, + size:5 +}) +const showProcessNodeData=ref() //工序分页数据展示 +const showMaterialsData=ref() //物料信息分页展示 +const productCode=ref() +//初始化图形组件 +const graph = ref() +const rowData = ref() const workStationList = ref() //工位数据 // 附件默认数据 const annexData = reactive({ @@ -203,23 +243,25 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { if(val.length>0){ val.forEach(item=>{ if(processData.value.find(obj=>obj.code==item.code)==undefined){ - processData.value.push({code:item.code,name:item.name})} + processData.value.push({code:item.code,name:item.name}) + page.value.total=processData.value.length + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) + } }) } } const deleteNode=(row)=>{ processData.value.splice(processData.value.indexOf(row),1) + page.value.total=processData.value.length + page.value.current=1 graph.value.removeNode(row.code) } -const productCode=ref() -//初始化图形组件 -const graph = ref() -const rowData = ref() + const openDetail = (row: any) => { rowData.value = row console.log('rowData',rowData.value) - titleNameRef.value = rowData.value.processrouteCode - titleValueRef.value = rowData.value.processName + titleNameRef.value = rowData.value.processName + titleValueRef.value =rowData.value.processrouteCode processRouteId.value = rowData.value.id productCode.value=rowData.value.productCode routeVersion.value=rowData.value.routeVersion @@ -264,7 +306,7 @@ const getProcessInfo = async (id: any) => { /** 获取产品信息 */ const getItembasicInfo = async (code: String) => { const res = await ProcessrouteApi.getProductInfo(code) - console.log('productData',res) + //console.log('productData',res) productData.value = res } /** 获取物料列表 */ @@ -302,28 +344,37 @@ const getProcessList = async (code) => { //console.log('code',code) const res = await ProcessrouteApi.getProcessrouteNodeList(code) processData.value = res + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) //return res } // 并行执行所有异步操作 const nodeClick = (e, x, y, node, view) => { + currentNode.value.code=node.id + currentNode.value.name=node.attrs.title.text Promise.all([ getProcessInfo(node.id), getProcessBomList(productCode.value,node.id), getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => { + ]).then(([processInfoList,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 //message.info(JSON.stringify(processIndoList)) - console.log('basicBom',basicBom) + //console.log('basicBom',basicBom) //获取绑定的物料信息 materialData.value = basicBom + pageM.value.total=materialData.value.length + pageM.value.current=1 + showMaterialsData.value=materialData.value.slice((pageM.value.current-1)*pageM.value.size,pageM.value.size) //获取绑定的模具信息 mouldData.value = patternPage.list //获取绑定的工位信息 workStationList.value = workstationInfoList.list }).catch(error => { - console.error("Error:", error); + //console.error("Error:", error); materialData.value = [] + showMaterialsData.value=[] + pageM.value.total=materialData.value.length + pageM.value.current=1 mouldData.value = [] workStationList.value = [] }); @@ -362,6 +413,7 @@ const userAddNode = (row) => { // ] }) } + nodeClick(undefined,undefined, undefined, node_template, graph.value) } } //------- @@ -382,7 +434,7 @@ const saveResult = async () => { return } let gdata = { - processrouteCode: titleNameRef.value, + processrouteCode: titleValueRef.value, routeVersion:routeVersion.value, graphJson: graph.value.toJSON(), processrouteId: processRouteId.value @@ -442,6 +494,58 @@ const deleteAnnexSuccess = async () => { getFileList() getChangeRecordList() } + +const handleCurrentChange=(value: number)=>{ + let index=(value-1)*page.value.size + page.value.current=value + //console.log('index',index) + showProcessNodeData.value=processData.value.slice(index,index+page.value.size) + //console.log('processData.value-472',processData.value) + //console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handlePrevClick=(value: number)=>{ + page.value.current=value-1 + if(page.value.current==0) { + page.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClick=(value: number)=>{ + page.value.current=value+1 + if(page.value.current>page.value.total/page.value.size) { + page.value.current=page.value.total/page.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleCurrentChangeM=(value: number)=>{ + let index=(value-1)*pageM.value.size + pageM.value.current=value + //console.log('index',index) + showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) + +} +const handlePrevClickM=(value: number)=>{ + pageM.value.current=value-1 + if(pageM.value.current==0) { + pageM.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClickM=(value: number)=>{ + pageM.value.current=value+1 + if(pageM.value.current>pageM.value.total/page.value.size) { + pageM.value.current=page.value.total/pageM.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} // 验证图形 onUnmounted?.(() => {}) const emit = defineEmits(['close']) diff --git a/src/views/mes/processroute/components/graphbase.data.ts b/src/views/mes/processroute/components/graphbase.data.ts index cf14d8073..8426a4415 100644 --- a/src/views/mes/processroute/components/graphbase.data.ts +++ b/src/views/mes/processroute/components/graphbase.data.ts @@ -138,7 +138,7 @@ export const start_node = ref({ id: 'startNode', label: '开始', x: 50, - y: 200, + y: 100, attrs: { body: { rx: 20, @@ -151,8 +151,8 @@ export const start_node = ref({ //结束节点的定义 export const end_node = ref({ id: 'endNode', - x: 200, - y: 200, + x: 400, + y: 100, label: '结束', attrs: { body: { diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue index c58a01025..b42ae5cd2 100644 --- a/src/views/mes/workScheduling/components/Detail.vue +++ b/src/views/mes/workScheduling/components/Detail.vue @@ -28,7 +28,16 @@
- + + - +