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

廖井涛

2024-05-16 a9d8f80c82234bc7c46f117eae00e75304a4e972

 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue

@@ -32,13 +32,14 @@
      let endTime = form.date1[1]
      let state = optionVal.value
        request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
        if (res.code == 200) {
          ElMessage.success(t('workOrder.deleteOk'))
          //location.reload();
          router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
        } else {
          ElMessage.warning(res.msg)
        }
          if (res.code == 200 && res.data===true) {
            ElMessage.success(t('workOrder.deleteOk'))
            router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
          } else {

            ElMessage.warning('删除失败，检查是否已分架')

          }
      })
      break
    }