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

chenlu

2024-09-24 edc227277159601c5cb86829f1c5ce14cf7903a4

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

@@ -26,10 +26,6 @@
      router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
      break
    }
    case 'delete': {
      alert('我接收到子组件传送的删除信息')
      break
    }
  }
}

@@ -71,19 +67,23 @@
const {currentRoute} = useRouter()
const route = currentRoute.value

let id = route.query.orderId
onMounted(() => {
  let id = route.query.orderId

request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
  request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {

  if (res.code == 200) {
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
  }
    if (res.code == 200) {
      pageTotal.value = res.data.total
      produceList = produceList.value.concat(deepClone(res.data.data))
      xGrid.value.reloadData(produceList)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
})




/*使用筛选，后端获取数据*/
@@ -216,6 +216,10 @@
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if(selectRecords.length!=$table.getTableData().fullData.length){
              ElMessage.warning(t('workOrder.msg'))
              return;
            }

            let workOrderData = ref({
              orderdetail: selectRecords,
@@ -225,7 +229,7 @@
            request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
              if (res.code == 200 && res.data===true) {
                ElMessage.success(t('basicData.msg.saveSuccess'))
                router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:id,random:Math.random()}})
                router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
              } else {
                ElMessage.warning(res.msg)
              }