From 9c7505a22f6c249184228de7c6f256a4d880dfed Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 14 三月 2025 09:36:06 +0800
Subject: [PATCH] 1、设备类管理页面完成增删改查功能 2、产品结构树工序及工步层级引入设备类概念由系统参数配置决定是否展示，若设备类存在时则NC文档挂载在设备类下不存在时则按照对应工序或工步层级下 3、产品结构树工序及工步层级的刀具列表实现增删改查功能 4、新增设备类管理页面并完成布局 5、产品结构树接口调整，产品结构树节点实体信息通过点击后调取接口获取 6、产品结构树搜素输入框增加防抖机制，避免每次输入都重新计算消耗性能使页面卡顿 7、新增工序及工步层级的刀具列表并添加系统权限 8、用户管理页面移除新增用户时的密码校验 9、产品结构树各层级属性信息展示由每行3列调整为每行4列 10、产品结构树页面在工序和工步层级实现对设备类的增删改查功能
---
src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue | 101 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
index cd0e076..25d939d 100644
--- a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
@@ -1,14 +1,14 @@
<template>
<a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="12">
- <a-form-model-item label="宸ュ簭鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processCode">
+ <a-form-model-item label="宸ュ簭鍙�" prop="processCode">
<a-input v-model="model.processCode" placeholder="璇疯緭鍏ュ伐搴忓彿"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ュ簭鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processName">
+ <a-form-model-item label="宸ュ簭鍚嶇О" prop="processName">
<a-input v-model="model.processName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�"></a-input>
</a-form-model-item>
</a-col>
@@ -17,19 +17,32 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="鍔犲伐璁惧缂栧彿" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-select v-model="model.processingEquipmentCode" placeholder="璇烽�夋嫨鍔犲伐璁惧缂栧彿"></a-select>
+ <j-dict-select-tag v-model="model.processingEquipmentCode" placeholder="璇烽�夋嫨鍔犲伐璁惧缂栧彿" dictCode="mdc_equipment,equipment_id,equipment_id"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
- <a-form-model-item label="宸ヨ壓缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="鍔犲伐璁惧鍨嬪彿">
+ <a-input v-model="model.processingEquipmentModel" placeholder="璇疯緭鍏ュ姞宸ヨ澶囧瀷鍙�"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍔犲伐璁惧绫诲瀷">
+ <a-input v-model="model.processingEquipmentOs" placeholder="璇疯緭鍏ュ姞宸ヨ澶囩被鍨�"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="宸ヨ壓缂栧彿">
<a-input v-model="model.craftNo" placeholder="璇疯緭鍏ュ伐鑹虹紪鍙�"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ヨ壓瑙勭▼鐗堟湰" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="宸ヨ壓瑙勭▼鐗堟湰">
<a-input v-model="model.craftVersion" placeholder="璇疯緭鍏ュ伐鑹鸿绋嬬増鏈�"></a-input>
</a-form-model-item>
</a-col>
@@ -37,12 +50,12 @@
<a-row>
<a-col :span="12">
- <a-form-model-item label="宸ュ簭绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="宸ュ簭绫诲瀷">
<a-input v-model="model.processType" placeholder="璇疯緭鍏ュ伐搴忕被鍨�"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ュ簭鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="宸ュ簭鎻忚堪">
<a-input v-model="model.description" placeholder="璇疯緭鍏ュ伐搴忔弿杩�"></a-input>
</a-form-model-item>
</a-col>
@@ -50,33 +63,30 @@
<a-row>
<a-col :span="12">
- <a-form-model-item label="宸ヨ缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="宸ヨ缂栧彿">
<a-input v-model="model.assembleStep" placeholder="璇疯緭鍏ュ伐瑁呯紪鍙�"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ヨ鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="宸ヨ鍚嶇О">
<a-input v-model="model.assembleName" placeholder="璇疯緭鍏ュ伐瑁呭悕绉�"></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
-
- <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
- import SelectDeviceDrawer from '@/views/system/modules/SelectDeviceDrawer'
export default {
name: 'ProcessModalForm',
- components: { SelectDeviceDrawer },
+ components: {},
data() {
return {
model: {
- passCount: 0
+ processType: 0
},
labelCol: {
xs: { span: 24 },
@@ -96,34 +106,17 @@
},
confirmLoading: false,
validatorRules: {
- equipmentIds: [
- { required: true, message: '璇烽�夋嫨璁惧!' }
+ processCode: [
+ { required: true, message: '璇疯緭鍏ュ伐搴忓彿!' }
],
- partId: [
- { required: true, message: '璇疯緭鍏ラ浂浠跺彿!' }
- ],
- standardProcessLong: [
- { required: true, message: '璇疯緭鍏ユ爣鍑嗗姞宸ュ伐鏃�(min)!' }
- ],
- processCount: [
- { required: true, message: '璇疯緭鍏ュ姞宸ラ浂浠舵暟閲�!' }
- ],
- passCount: [
- { required: true, message: '璇疯緭鍏ュ悎鏍奸浂浠舵暟閲�!' }
- ],
- theDate: [
- { required: true, message: '璇烽�夋嫨鏃ユ湡!' }
+ processName: [
+ { required: true, message: '璇疯緭鍏ュ伐搴忓悕绉�!' }
]
},
url: {
- add: '/mdc/mdcPartProcessInfo/add',
- edit: '/mdc/mdcPartProcessInfo/edit'
+ add: '/nc/stream/process/add',
+ edit: '/nc/stream/process/edit'
}
- }
- },
- computed: {
- formDisabled() {
- return this.disabled
}
},
created() {
@@ -131,18 +124,12 @@
this.modelDefault = JSON.parse(JSON.stringify(this.model))
},
methods: {
- add() {
- this.edit(this.modelDefault)
+ add(params) {
+ this.edit({ ...this.modelDefault, ...params })
},
edit(record) {
- this.model = Object.assign({}, { equipmentIds: record.equipmentId }, record)
+ this.model = Object.assign({}, record)
console.log('model', this.model)
- this.visible = true
- },
- inputNumberChange() {
- if (this.model.standardProcessLong && this.model.processCount) {
- this.model.totalProcessLong = this.model.standardProcessLong * this.model.processCount
- }
},
submitForm() {
const that = this
@@ -151,11 +138,13 @@
if (valid) {
that.confirmLoading = true
let httpUrl = ''
- let method = 'post'
+ let method = ''
if (!this.model.id) {
httpUrl += this.url.add
+ method = 'post'
} else {
- httpUrl += this.url.edit
+ httpUrl += this.url.edit + `/${this.model.id}`
+ method = 'put'
}
httpAction(httpUrl, this.model, method).then((res) => {
if (res.success) {
@@ -176,20 +165,6 @@
}
})
- },
- deviceSearch() {
- this.$refs.selectDeviceDrawer.visible = true
- this.$refs.selectDeviceDrawer.selectedRowKeys = []
- this.$refs.selectDeviceDrawer.selectedRows = []
- this.$refs.selectDeviceDrawer.checkedKeys = this.model.equipmentIds ? this.model.equipmentIds.split(',') : []
- },
- /**
- * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
- * @param data 宸查�夋嫨鐨勮澶�
- */
- selectOK(data) {
- this.$set(this.model, 'equipmentIds', data.join(','))
- if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
}
}
}
--
Gitblit v1.9.3