From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
index c75fab6..18f2b52 100644
--- a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
+++ b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
@@ -19,7 +19,7 @@
:wrapperCol='wrapperCol'
>
<a-input
- :disabled="disableSubmit"
+ :disabled="true"
placeholder='璇疯緭鍗曟嵁鍙�'
v-decorator="['num', validatorRules.num]"
/>
@@ -31,21 +31,6 @@
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
-<!-- <j-dict-select-tag
- allow-clear
- :disabled='disableSubmit'
- :placeholder="disableSubmit?'':'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :triggerChange='true'
- dictCode="sys_depart,depart_name,id,del_flag!='1'"
- v-decorator="['departId', validatorRules.departId]"
- />-->
-<!-- <a-select
- :placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :options="this.departs"
- :disabled="disableSubmit"
- style="width: 100%"
- v-model='model.departId'
- />-->
<a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -319,6 +304,7 @@
url: {
add: '/spare/sparePartCancellingStocks/add',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ getNum: '/eam/sysIdentity/getNumNew',
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
edit: '/spare/sparePartCancellingStocks/edit'
},
@@ -342,9 +328,6 @@
model: data[i].model,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitName,
- /* auxiliaryUnitId: data[i].auxiliaryUnitId,
- auxiliaryUnitName: data[i].auxiliaryUnitName, */
- /* conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
supplierId: data[i].supplierId,
@@ -418,6 +401,13 @@
this.codeDisable = true
} else {
this.codeDisable = false
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'SparePartCancellingStocks', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
}
},
--
Gitblit v1.9.3