From 1f63e3d0172be6e4060ff1ae3fb1ebffa297315b Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Thu, 8 Jan 2026 14:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mfg/craft-flow/CraftFlow.vue | 35 ++++++++++++++++++++++
 src/pages/mfg/craft/Craft.vue          | 41 +++++---------------------
 src/pages/mfg/craft/CraftForm.vue      | 29 +++++++-----------
 3 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 src/pages/mfg/craft-flow/CraftFlow.vue

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 @@
+<script lang="ts" setup>
+const showDialog = ref(false)
+const submiting = ref(false)
+
+function dialogCloseHandler() {
+}
+
+function submitHandler() {
+}
+
+
+defineExpose({
+  open(_: CraftTypes.SearchCraftResult = {}) {
+    showDialog.value = true
+  },
+})
+</script>
+
+<template>
+  <ElDialog v-model="showDialog"
+    :close-on-click-modal="false"
+    destroy-on-close
+    width="90vw"
+    @close="dialogCloseHandler">
+    <div></div>
+    <template #footer>
+      <ElButton @click="showDialog = false">关闭</ElButton>
+      <ElButton :loading="submiting" type="primary" @click="submitHandler">提交</ElButton>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="stylus" scoped>
+
+</style>
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 @@
       <ElTableColumn label="操作" width="180">
         <template #default="scope">
           <div class="action-btn">
-            <!-- <ElPopconfirm
-              confirm-button-text="是"
-              cancel-button-text="否"
-              confirm-button-type="danger"
-              cancel-button-type="primary"
-              placement="top"
-              title="是否删除当前数据?"
-              width="180"
-              @confirm="delHandler(scope)">
-              <template #reference>
-                <ElButton text type="danger" :loading="deling">删除</ElButton>
-              </template>
-            </ElPopconfirm> -->
-
-            <!-- <ElButton text type="primary" @click="modifyHandler(scope)">修改</ElButton> -->
-            <ElButton text type="primary" @click="modifyHandler(scope)">配置工艺流程</ElButton>
+            <ElButton text type="primary" @click="configCraftFlow(scope)">配置工艺流程</ElButton>
           </div>
         </template>
       </ElTableColumn>
@@ -88,6 +73,7 @@
       layout="->, sizes, total, prev, pager, next"
       @change="paging"/>
     <CraftForm ref="craftForm" @edit-succ="paging"/>
+    <CraftFlow ref="craftFlow" @edit-succ="paging"/>
   </Page>
 </template>
 
@@ -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<CraftTypes.SearchCraftResult[]>([]))
@@ -106,30 +93,16 @@ const searchForm = Utils.resetAble(reactive<CraftTypes.SearchCraftParam>({
   size: 20,
 }))
 const searching = ref(false)
-const deling = ref(false)
 const showSearchForm = ref(true)
 const craftFormIns = useTemplateRef<InstanceType<typeof CraftForm>>('craftForm')
+const craftFlowIns = useTemplateRef<InstanceType<typeof CraftFlow>>('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">
-      <ElFormItem label="编码" prop="sn">
-        <ElInput
-          v-model="formData.sn"
-          :disabled="status === 'view'"
-          placeholder="编码"/>
-      </ElFormItem>
       <ElFormItem label="产品" prop="goodsId">
-        <ADropTable v-model="formData.goodsId as string" :columns="dropTableColumns" :loader="dropTableLoader" :multiple="true" display-field="goodsName"/>
+        <ADropTable v-model="formData.goodsId as string" :columns="dropTableColumns" :loader="dropTableLoader" display-field="goodsName"/>
       </ElFormItem>
       <ElFormItem label="工艺名称" prop="craftName">
         <ElInput
@@ -36,18 +30,18 @@
           <ElOption label="人工" value="RenGong"/>
         </ElSelect>
       </ElFormItem>
-      <ElFormItem label="是否可用" prop="canuse">
-        <ElCheckbox
-          v-model="formData.canuse"
-          :disabled="status === 'view'"
-          placeholder="是否可用"/>
-      </ElFormItem>
       <ElFormItem label="备注" prop="memo">
         <ElInput
           v-model="formData.memo"
           :disabled="status === 'view'"
           placeholder="备注"/>
       </ElFormItem>
+      <ElFormItem label="是否可用" prop="canuse">
+        <ElCheckbox
+          v-model="formData.canuse"
+          :disabled="status === 'view'"
+          placeholder="是否可用"/>
+      </ElFormItem>
     </ElForm>
     <template #footer>
       <ElButton @click="showDialog = false">{{ status === 'view' ? '关闭' : '取消' }}</ElButton>
@@ -78,14 +72,11 @@ const craftFormIns = useTemplateRef<FormInstance>('craftForm')
 
 const formData = Utils.resetAble(reactive<CraftTypes.SearchCraftResult>({}))
 const rules = reactive<FormRules<CraftTypes.SearchCraftResult>>({
-  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 = [
   {