fix:回退原先版本

charles

2024-04-29 c7f3fd5215399b37d0511b3bd555150ff1b13507

 src/stores/craftModel.ts

@@ -13,14 +13,34 @@
  function getCraftModelList() {
    if (taskStore.activeTask?.Procedure.ID) {
      craftModelList.value = []
      apiGetCraftModelList({
        procedureId: taskStore.activeTask?.Procedure.ID,
        page: page.value,
        pageSize: 6
      }).then((res) => {
        craftModelList.value = res.data ?? []
        total.value = res.total
      })
      const procedureModel = taskStore.activeTask?.ProcedureModel
      const craftObj = [
        {
          ID: Number(taskStore.activeTask?.Procedure?.productProcedureID),
          CreatedAt: taskStore.activeTask?.Procedure?.CreatedAt,
          UpdatedAt: taskStore.activeTask?.Procedure?.UpdatedAt,
          DeletedAt: taskStore.activeTask?.Procedure?.DeletedAt,
          number: procedureModel?.number,
          product: procedureModel?.product,
          procedure: procedureModel?.procedure,
          Params: '',
          paramsMap: procedureModel?.paramsMap,
          deviceId: '',
          isUpdate: false,
          newParamsMap: '',
          newNumber: ''
        }
      ]
      craftModelList.value = craftObj ?? []

      // apiGetCraftModelList({
      //   procedureId: taskStore.activeTask?.Procedure.ID,
      //   page: page.value,
      //   pageSize: 6
      // }).then((res) => {
      //   craftModelList.value = res.data ?? []
      //   total.value = res.total
      // })
    }
  }

@@ -40,18 +60,18 @@
    if (taskStore.activeTask?.Procedure.ID && !loading.value && hasMore.value) {
      page.value++
      loading.value = true
      apiGetCraftModelList({
        procedureId: taskStore.activeTask?.Procedure.ID,
        page: page.value,
        pageSize: 6
      })
        .then((res) => {
          craftModelList.value = [...craftModelList.value, ...(res.data ?? [])]
          total.value = res.total
        })
        .finally(() => {
          loading.value = false
        })
      // apiGetCraftModelList({
      //   procedureId: taskStore.activeTask?.Procedure.ID,
      //   page: page.value,
      //   pageSize: 6
      // })
      //   .then((res) => {
      //     craftModelList.value = [...craftModelList.value, ...(res.data ?? [])]
      //     total.value = res.total
      //   })
      //   .finally(() => {
      //     loading.value = false
      //   })
    }
  }