From 79c0ff6743304f57cf0435967ace9acb9be61b8c Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Tue, 26 Nov 2024 15:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=B1=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .../bookingcabin/CabinManagement/columns.tsx  | 14 ++++++++
 src/views/system/serviceFlow/detail.vue       |  2 +-
 src/views/system/serviceFlow/index.vue        | 32 ++++++++++++-------
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index cbb55fe5..57d32870 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,7 @@ VITE_PUBLIC_PATH = /
 # Please note that no line breaks
 # VITE_PROXY = [["/basic-api","http://60.209.125.238"],["/upload","http://localhost:3300/upload"]]
 # VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
-VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
+VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
 
 # Delete console
 VITE_DROP_CONSOLE = false
diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx
index 7bd107d8..feb88817 100644
--- a/src/views/bookingcabin/CabinManagement/columns.tsx
+++ b/src/views/bookingcabin/CabinManagement/columns.tsx
@@ -1199,6 +1199,20 @@ export const detialForm: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+  {
+    field: 'recvEmail',
+    label: '接受邮箱',
+    dynamicDisabled:true,
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'senderEmail',
+    label: '来源邮箱',
+    component: 'Input',
+    dynamicDisabled:true,
+    colProps: { span: 4 },
+  },
 ]
 
 export const detialTimeForm: FormSchema[] = [
diff --git a/src/views/system/serviceFlow/detail.vue b/src/views/system/serviceFlow/detail.vue
index a5630f96..5fe5f55a 100644
--- a/src/views/system/serviceFlow/detail.vue
+++ b/src/views/system/serviceFlow/detail.vue
@@ -439,7 +439,7 @@ function handleSubmit() {
 }
 function handlePub() {
     workFlowSetUnPublishRelease([form.value.pkId]).then(res => {
-        if (res.data.ext[0].succ) {
+        if (res.succeeded) {
             createMessage.success('发布成功')
             visible.value = false
         } else {
diff --git a/src/views/system/serviceFlow/index.vue b/src/views/system/serviceFlow/index.vue
index ca488273..1be23b52 100644
--- a/src/views/system/serviceFlow/index.vue
+++ b/src/views/system/serviceFlow/index.vue
@@ -10,20 +10,10 @@
                     >
                     <span class="iconfont icon-qiyong-danse" @click="handleApply">启用</span>
                     <span class="iconfont icon-quxiaoqiyong-danse" @click="handleWithdraw">取消启用</span>
+                    <span class="iconfont icon-qiyong-danse" @click="handlePub">发布</span>
                 </TableButton>
             </template>
             <template v-slot:bodyCell="{ column, record }">
-                <!-- <template v-if="column.key === 'action'">
-                    <TableAction :actions="[
-                        {
-                            icon: 'clarity:note-edit-line',
-                            tooltip: '编辑',
-                            onClick: () => {
-                                GoDetailed(true, record)
-                            },
-                        },
-                    ]" />
-                </template> -->
                 <template v-if="column.key === 'isEnable'">
                     <span v-if="record.isEnable == 1">是</span>
                     <span v-if="record.isEnable == 0">否</span>
@@ -36,7 +26,7 @@
 </template>
 <script lang="ts" setup name="服务流程台账">
 import { ref } from 'vue'
-import { GetList, SetUnEnable, SetEnable, Delete } from './api.js'
+import { GetList, SetUnEnable, SetEnable, Delete,workFlowSetUnPublishRelease } from './api.js'
 import { BasicTable, useTable } from '/@/components/Table'
 import { columns, searchFormSchema, detailForm } from './columns'
 import manyModel from './manyModel.vue'
@@ -84,6 +74,24 @@ function GoDetailed(type, row) {
     }
 }
 const manyModelRef = ref()
+function handlePub(){
+    let ids = []
+    ids = getVxeSelectRows().map((item) => {
+        return item.pkId
+    })
+    if (ids.length == 0) {
+        createMessage.error('请选择数据')
+        return false
+    }
+    workFlowSetUnPublishRelease(ids).then(res => {
+        if (res.succeeded) {
+            createMessage.success('操作成功')
+            clearSelectedRowKeys()
+            reload()
+            manyModelRef.value.init(res)
+        }
+    })
+}
 
 function handleSuccess(){
     reload()