Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

13 小时以前 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8

 src/views/mes/pro/feedback/modules/batch-feedback.vue

@@ -24,8 +24,6 @@
      selectedTasks.value = [];
      formData.value = {
        feedbackQuantity: undefined,
        qualifiedQuantity: undefined,
        unqualifiedQuantity: undefined,
        remark: '',
      };
    }
@@ -36,8 +34,6 @@
const selectedTasks = ref<MesProTaskApi.Task[]>([]);
const formData = ref({
  feedbackQuantity: undefined as number | undefined,
  qualifiedQuantity: undefined as number | undefined,
  unqualifiedQuantity: undefined as number | undefined,
  remark: '',
});
const submitting = ref(false);
@@ -68,8 +64,6 @@
    const result = await batchCreateFeedback({
      taskIds: selectedTasks.value.map((t) => t.id!),
      feedbackQuantity: formData.value.feedbackQuantity,
      qualifiedQuantity: formData.value.qualifiedQuantity,
      unqualifiedQuantity: formData.value.unqualifiedQuantity,
      remark: formData.value.remark || undefined,
    });
    if (result.failCount) {
@@ -113,24 +107,6 @@
          :min="0.01"
          :precision="2"
          placeholder="请输入报工数量（应用到所有选中任务）"
          class="!w-full"
        />
      </a-form-item>
      <a-form-item label="合格品数量">
        <a-input-number
          v-model:value="formData.qualifiedQuantity"
          :min="0"
          :precision="2"
          placeholder="请输入合格品数量"
          class="!w-full"
        />
      </a-form-item>
      <a-form-item label="不良品数量">
        <a-input-number
          v-model:value="formData.unqualifiedQuantity"
          :min="0"
          :precision="2"
          placeholder="请输入不良品数量"
          class="!w-full"
        />
      </a-form-item>