From 77fe33ce3227c630f0f646e992e60916fd54dd34 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期六, 16 八月 2025 09:32:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/cms/modules/CuttingToolModal.vue | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/cms/modules/CuttingToolModal.vue b/src/views/cms/modules/CuttingToolModal.vue index b6cc324..dcec493 100644 --- a/src/views/cms/modules/CuttingToolModal.vue +++ b/src/views/cms/modules/CuttingToolModal.vue @@ -98,8 +98,8 @@ slot-scope='text, record, index' > <div :key="col.dataIndex"> - - + + <a-input :value="text" @@ -329,7 +329,7 @@ } this.$nextTick(() => { this.form.setFieldsValue( - pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit', + pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit', 'cuttingMaterial','drawingNumber','inventoryWarning','remark') ) }) @@ -354,6 +354,7 @@ this.deletePropertiesIds.push(record.id); } }, + handleOk() { const that = this let dataSource = that.dataSource; @@ -388,7 +389,7 @@ handleCancel() { this.close() }, - + //娣诲姞鎵╁睍灞炴�� addPropertiesList() { const temp = [...(this.dataSource || [])] -- Gitblit v1.9.3