Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-12-04 eba3314826d53ff0f7e5679d185baaff84e50354

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue

@@ -14,6 +14,7 @@
import {VXETable} from "vxe-table";
import  useUserInfoStore from '@/stores/userInfo'
import {useI18n} from "vue-i18n";
import { computed } from 'vue'
import UpdateOrderCraft from "@/components/sd/order/UpdateOrderCraft.vue";
import {filterChanged} from "@/hook";
let productGlassTypeStore = useProductGlassTypeStore()
@@ -78,20 +79,40 @@
const saveCraft = () => {
  //rowIndex.value.process = craftObj.newCraft.join('->')
 let orderProcess= craftObj.newCraft.join('->')
  request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
    if (res.code == 200 && res.data === true) {
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({
        path: '/main/processCard/SelectDetailProcessCard',
        query: {processId: processId,random: Math.random()}
      })
    } else {
  //获取差异工序
  const diffCraft = computed(() => {
    return [
      ...craftObj.oldCraft.filter(item => !craftObj.newCraft.includes(item)), //删除
      ...craftObj.newCraft.filter(item => !craftObj.oldCraft.includes(item))//增加
    ]
  })
  if (diffCraft.value == '') {//无变化不执行后续
    return
  }
  //获取最新报工工序的顺序
request.post(`/processCard/getNewProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${diffCraft.value}`).then((res) => {
    if (res.code == 200 ) {
      if (res.data){
        request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
          if (res.code == 200 && res.data === true) {
            ElMessage.success(t('basicData.msg.saveSuccess'))
            router.push({
              path: '/main/processCard/SelectDetailProcessCard',
              query: {processId: processId,random: Math.random()}
            })
          } else {

      ElMessage.warning(t('processCard.updateProcessMsg'))
            ElMessage.warning(t('processCard.updateProcessMsg'))

          }
        })
        craftVisible.value= false
      }else {
        ElMessage.warning(t('processCard.updateProcessMsg'))
      }
    }
  })
  craftVisible.value= false

}