diff --git a/src/pages/mfg/craft-flow/CraftFlow.vue b/src/pages/mfg/craft-flow/CraftFlow.vue
new file mode 100644
index 0000000..d7bdcc0
--- /dev/null
+++ b/src/pages/mfg/craft-flow/CraftFlow.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+ 关闭
+ 提交
+
+
+
+
+
diff --git a/src/pages/mfg/craft/Craft.vue b/src/pages/mfg/craft/Craft.vue
index 5d2a1d0..70edfb7 100644
--- a/src/pages/mfg/craft/Craft.vue
+++ b/src/pages/mfg/craft/Craft.vue
@@ -58,22 +58,7 @@
-
-
-
- 配置工艺流程
+ 配置工艺流程
@@ -88,6 +73,7 @@
layout="->, sizes, total, prev, pager, next"
@change="paging"/>
+
@@ -98,6 +84,7 @@ import Page from '@/components/page/Page.vue'
import { elIcons } from '@/common/element/element.ts'
import Utils from '@/common/utils'
import { ElMessage } from 'element-plus'
+import CraftFlow from '@/pages/mfg/craft-flow/CraftFlow.vue'
const totalCount = ref(0)
const tableData = Utils.resetAble(reactive([]))
@@ -106,30 +93,16 @@ const searchForm = Utils.resetAble(reactive({
size: 20,
}))
const searching = ref(false)
-const deling = ref(false)
const showSearchForm = ref(true)
const craftFormIns = useTemplateRef>('craftForm')
+const craftFlowIns = useTemplateRef>('craftFlow')
function showDialog(data?: CraftTypes.SearchCraftResult) {
craftFormIns.value?.open(data)
}
-/*
- function delHandler({row}: { row: CraftTypes.SearchCraftResult }) {
- deling.value = true
- CraftApi.del([ row.id! ])
- .then(() => {
- ElMessage.success('删除成功')
- paging()
- })
- .finally(() => {
- deling.value = false
- })
- }
- */
-
-function modifyHandler({row}: { row: CraftTypes.SearchCraftResult }) {
- showDialog(row)
+function configCraftFlow(data?: CraftTypes.SearchCraftResult) {
+ craftFlowIns.value?.open(data)
}
function addHandler() {
@@ -157,7 +130,7 @@ function disabledCraftHandler(val: string | number | boolean, id: string) {
searching.value = true
CraftApi.disable(id, val as boolean)
.then(() => {
- ElMessage.success(val ? '禁用成功' : '启用成功')
+ ElMessage.success(val ? '启用成功' : '禁用成功')
paging()
})
}
diff --git a/src/pages/mfg/craft/CraftForm.vue b/src/pages/mfg/craft/CraftForm.vue
index 6997e3f..8ff2064 100644
--- a/src/pages/mfg/craft/CraftForm.vue
+++ b/src/pages/mfg/craft/CraftForm.vue
@@ -9,14 +9,8 @@
:rules="rules"
class="form-panel"
label-width="auto">
-
-
-
-
+
-
-
-
+
+
+
{{ status === 'view' ? '关闭' : '取消' }}
@@ -78,14 +72,11 @@ const craftFormIns = useTemplateRef('craftForm')
const formData = Utils.resetAble(reactive({}))
const rules = reactive>({
- id: [ {required: true, message: '请填写Id', trigger: 'blur'} ],
- sn: [ {required: true, message: '请填写编码', trigger: 'blur'} ],
- goodsId: [ {required: true, message: '请填写终产品 Id', trigger: 'blur'} ],
+ goodsId: [ {required: true, message: '请选择产品', trigger: 'change'} ],
craftName: [ {required: true, message: '请填写工艺名称', trigger: 'blur'} ],
craftVer: [ {required: true, message: '请填写工艺版本号', trigger: 'blur'} ],
- craftCategory: [ {required: true, message: '请填写工艺类型;字典编码:craft_category,ZiDongHua-->自动化、RenGong-->人工', trigger: 'blur'} ],
- canuse: [ {required: true, message: '请填写是否可用;0-->否、1-->是', trigger: 'blur'} ],
- memo: [ {required: true, message: '请填写备注', trigger: 'blur'} ],
+ craftCategory: [ {required: true, message: '请填写工艺类型', trigger: 'blur'} ],
+ canuse: [ {required: true, message: '请选择是否可用', trigger: 'blur'} ],
})
const dropTableColumns = [
{