From b7ad54294da15dccc59f7b6c879af3e000024d9d Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期四, 19 六月 2025 17:51:30 +0800 Subject: [PATCH] 1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息(由于数据为定时刷新不能每次获取数据均清空) 3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题 4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中 --- src/views/tms/modules/GoodsShelvesForm.vue | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/views/tms/modules/GoodsShelvesForm.vue b/src/views/tms/modules/GoodsShelvesForm.vue index 3ef07b7..a2a91aa 100644 --- a/src/views/tms/modules/GoodsShelvesForm.vue +++ b/src/views/tms/modules/GoodsShelvesForm.vue @@ -40,7 +40,7 @@ </a-col> <a-col :span="12"> <a-form-model-item label="搴撲綅鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <a-input :disabled="true" :value="locationCode" placeholder="璇疯緭鍏ュ簱浣嶅彿" ></a-input> + <a-input v-model="model.locationCode" placeholder="璇疯緭鍏ュ簱浣嶅彿" ></a-input> </a-form-model-item> </a-col> </a-row> @@ -87,6 +87,8 @@ locationCode: '', remark: '' }, + autoLocationCode: '', // 鑷姩鎷兼帴鐨勫簱浣嶅彿 + userEditedLocationCode: false, labelCol: { xs: { span: 24 }, sm: { span: 5 }, @@ -125,7 +127,7 @@ return this.disabled }, //鎷兼帴搴撲綅鍙� - locationCode() { + autoGeneratedLocationCode() { const { shelfNumber, storey, arrange, columnNumber } = this.model; if (shelfNumber || storey || arrange || columnNumber) { return `${shelfNumber}${storey}${arrange}${columnNumber}`; @@ -182,10 +184,21 @@ }, }, watch: { - 'model.shelfNumber': 'updateLocationCode', - 'model.storey': 'updateLocationCode', - 'model.arrange': 'updateLocationCode', - 'model.columnNumber': 'updateLocationCode' + autoGeneratedLocationCode(newVal) { + // 鍙湁褰撶敤鎴锋病鏈夋墜鍔ㄨ緭鍏ユ椂鎵嶈嚜鍔ㄥ~鍏� + if (!this.userEditedLocationCode) { + this.model.locationCode = newVal; + } + this.autoLocationCode = newVal; + }, + 'model.locationCode'(newVal) { + // 濡傛灉鐢ㄦ埛鎵嬪姩杈撳叆锛屽垯鏍囪涓哄凡缂栬緫 + if (newVal !== this.autoLocationCode) { + this.userEditedLocationCode = true; + } else { + this.userEditedLocationCode = false; + } + } } } </script> \ No newline at end of file -- Gitblit v1.9.3