From 61a19a514eed8796ee2c6e7ab1111addf053cf67 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 28 五月 2025 15:46:18 +0800 Subject: [PATCH] 1.新增NC文件批次页签 2.批次页签新增 数控加工确认表按钮,点击按钮出现对应批次确认表 3.处理修改查询电子样板与NC文件查询页面处理文件名折叠问题 --- src/views/dnc/base/modules/ProductStructure/Cutter/CutterModalForm.vue | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Cutter/CutterModalForm.vue b/src/views/dnc/base/modules/ProductStructure/Cutter/CutterModalForm.vue index 3c5c2c9..11718fe 100644 --- a/src/views/dnc/base/modules/ProductStructure/Cutter/CutterModalForm.vue +++ b/src/views/dnc/base/modules/ProductStructure/Cutter/CutterModalForm.vue @@ -3,7 +3,7 @@ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-row> <a-col :span="12"> - <a-form-model-item label="鍒�鍏风紪鍙�" prop="cutterCode"> + <a-form-model-item label="鍒�鍏风紪鍙�"> <a-input v-model="model.cutterCode" placeholder="璇疯緭鍏ュ垁鍏风紪鍙�" :readOnly="disableSubmit"/> </a-form-model-item> </a-col> @@ -16,9 +16,8 @@ <a-row> <a-col :span="12"> - <a-form-model-item label="鍒�鍏风被鍨�"> - <j-dict-select-tag v-model="model.cutterType" placeholder="璇烽�夋嫨鍒�鍏风被鍨�" dictCode="cutter_type" - :disabled="disableSubmit"/> + <a-form-model-item label="鍒�鍏风畝绉�" prop="cutterType"> + <a-input v-model="model.cutterType" placeholder="璇疯緭鍏ュ垁鍏风畝绉�" :readOnly="disableSubmit"/> </a-form-model-item> </a-col> <a-col :span="12"> @@ -31,7 +30,7 @@ <a-row> <a-col :span="12"> - <a-form-model-item label="鍒�浣�"> + <a-form-model-item label="鍒�浣�" prop="cutterSpacing"> <a-input v-model="model.cutterSpacing" placeholder="璇疯緭鍏ュ垁浣�" :readOnly="disableSubmit"/> </a-form-model-item> </a-col> @@ -88,11 +87,14 @@ }, confirmLoading: false, validatorRules: { - cutterCode: [ - { required: true, message: '璇疯緭鍏ュ垁鍏风紪鍙�!' } + cutterType: [ + { required: true, message: '璇疯緭鍏ュ垁鍏风畝绉�!' } ], cutterName: [ { required: true, message: '璇疯緭鍏ュ垁鍏峰悕绉�!' } + ], + cutterSpacing: [ + { required: true, message: '璇疯緭鍏ュ垁浣�!' } ] }, url: { -- Gitblit v1.9.3