Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-28 ef5c96b51b961c1def04a3a4761d74c1d2cf01ed

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCardDetail.vue

@@ -96,8 +96,18 @@
    }
);


watch(() => props.technologyNumber,
    (newValue, oldValue) => {
  if (props.technologyNumber != null) {
    getWorkOrder();
  }
});


const getWorkOrder = () => {
  if (props.processId!=null || props.processId!=""){
  if ((props.processId != null && props.processId != "") && 
      (props.technologyNumber != null && props.technologyNumber != "")) {
    request.post(`/glassOptimize/getProcessCardDetail/${props.processId}/${props.technologyNumber}`).then((res) => {
      if(res.code==200){
        xGrid.value.loadData(res.data.data)
@@ -106,7 +116,6 @@
      }
    })
  }

}
</script>