diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue index 031cb6401..39103583b 100644 --- a/src/views/mes/pro/feedback/FeedbackForm.vue +++ b/src/views/mes/pro/feedback/FeedbackForm.vue @@ -7,12 +7,21 @@ :rules="formRules" label-width="120px" v-loading="formLoading" + :disabled="isDetail" > - + + + @@ -20,7 +29,7 @@ @@ -50,7 +59,7 @@ @@ -60,12 +69,35 @@ + + + + + + + + + + + + + + + + + + + + + + + 报工数量 @@ -87,7 +119,6 @@ v-model="formData.qualifiedQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" @change="handleQuantityChanged" /> @@ -99,7 +130,6 @@ v-model="formData.unqualifiedQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" @change="handleQuantityChanged" /> @@ -114,7 +144,6 @@ v-model="formData.feedbackQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" /> @@ -128,7 +157,6 @@ v-model="formData.laborScrapQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" @change="handleScrapChanged" /> @@ -140,7 +168,6 @@ v-model="formData.materialScrapQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" @change="handleScrapChanged" /> @@ -152,7 +179,6 @@ v-model="formData.otherScrapQuantity" :min="0" :precision="2" - :disabled="isDetail" class="!w-1/1" @change="handleScrapChanged" /> @@ -165,7 +191,7 @@ @@ -177,7 +203,7 @@ type="datetime" value-format="x" placeholder="请选择报工时间" - :disabled="isDetail" + :disabled="isHeaderReadonly" class="!w-1/1" /> @@ -186,7 +212,7 @@ @@ -201,13 +227,12 @@ type="textarea" :rows="3" placeholder="请输入备注" - :disabled="isDetail" /> - + - 通过 - 不通过 - 取 消 - - + + 保 存 + + + 提 交 + + + 通 过 + + + 不通过 + + 关 闭 @@ -241,6 +285,7 @@ diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 3c3b960f8..e17956d36 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -109,9 +109,9 @@ > @@ -144,47 +144,46 @@ @@ -197,19 +196,19 @@ /> - + diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 19a54e2c6..49cce4665 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -456,6 +456,7 @@ export const MesAutoCodeRuleCode = { DV_REPAIR_CODE: 'DV_REPAIR_CODE', // 维修单编码 PRO_PROCESS_CODE: 'PRO_PROCESS_CODE', // 工序编码 PRO_ROUTE_CODE: 'PRO_ROUTE_CODE', // 工艺路线编码 + PRO_FEEDBACK_CODE: 'PRO_FEEDBACK_CODE', // 生产报工单编码 PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE' // 生产工单编码 } as const