From 1550ea7fb0f98762062833a37f716ba459b986df Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期五, 28 二月 2025 15:53:38 +0800
Subject: [PATCH] 工作流 代办已办
---
src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue | 107 ++++++++++++++++++++++-------------------------------
1 files changed, 44 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..1866bd5 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,35 @@
<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: {},
+ props: {
+ allDeviceList: {
+ type: Array
+ }
+ },
data() {
return {
model: {
- passCount: 0
+ processType: 0
},
labelCol: {
xs: { span: 24 },
@@ -96,53 +111,31 @@
},
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() {
//澶囦唤model鍘熷鍊�
this.modelDefault = JSON.parse(JSON.stringify(this.model))
+ this.$bus.$on('sendAllDeviceList', deviceList => this.deviceList = deviceList)
},
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 +144,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 +171,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