Merge branch 'frame' into dev

src/components/Table/src/BasicTable.vue

@@ -49,6 +49,7 @@
         border="outer"
         :loading="getBindValues.loading"
         @cell-dblclick="dbclickVxeRow"
+        @cell-click="clickVxeRow"
         @sort-change="sortChangeEvent"
         @resizable-change="resizableChangeEvent"
         @radio-change="rowChange"
@@ -175,6 +176,7 @@ export default defineComponent({
     'register',
     'row-click',
     'row-dbClick',
+    'row-Click',
     'row-contextmenu',
     'row-mouseenter',
     'row-mouseleave',
@@ -485,6 +487,10 @@ export default defineComponent({
       emit('row-dbClick', row)
       // props.rowDbClick(row)
     }
+    const clickVxeRow = ({ row, column }) => {
+      emit('row-Click', row)
+      // props.rowDbClick(row)
+    }
     // vxe服务端排序
     const sortChangeEvent = ({ field, order }) => {
       if (order) {
@@ -545,6 +551,7 @@ export default defineComponent({
       wrapRef,
       tableAction,
       dbclickVxeRow,
+      clickVxeRow,
       redoHeight,
       fetch,
       getFormProps: getFormProps as any,

src/logics/theme/dark.ts

@@ -24,6 +24,5 @@ export async function updateDarkTheme(mode: string | null = 'light') {
       removeClass(htmlRoot, 'dark')
     }
   }
-  console.log(111111111111)
   htmlRoot.setAttribute('data-theme', mode)
 }

src/views/baseinfo/formcopy/components/Modal copy.vue

@@ -152,7 +152,6 @@
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
     await init()
-    console.log(unref(isUpdate), 11111111111111111)
 
     if (unref(isUpdate)) {
       rowId.value = data.record.id

src/views/baseinfo/formcopy/components/Modal.vue

@@ -195,7 +195,6 @@
     formLoading.value = true
     isUpdate.value = !!data?.isUpdate
     await init()
-    console.log(unref(isUpdate), 11111111111111111)
 
     if (unref(isUpdate)) {
       rowId.value = data.record.id

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -53,24 +53,28 @@ export const searchFormSchema: FormSchema[] = [
       optionLabelProp: 'label',
       options: [
         {
-          label: '全部',
+          label: '现舱',
-          value: '0',
+          value: 'INSTOCK',
         },
         {
-          label: '未取消',
+          label: '已使用',
-          value: '1',
+          value: 'USED',
         },
         {
-          label: '已取消',
+          label: '已退舱',
-          value: '2',
+          value: 'CUSTOMERBACK',
         },
         {
-          label: '已使用',
+          label: 'ALLSLOT',
-          value: '3',
+          value: '全部舱位',
+        },
+        {
+          label: '全部订舱',
+          value: 'ALLBOOKING',
         },
         {
-          label: '未使用',
+          label: '船公司退舱',
-          value: '4',
+          value: 'CARRIERCANCEL',
         },
       ],
     },
@@ -388,6 +392,15 @@ export const columns: BasicColumn[] = [
     sortable: true,
     customCell: sharedOnCell,
   },
+  {
+    title: '舱位状态',
+    align: 'left',
+    width: 100,
+    dataIndex: 'statusName',
+    showHeaderOverflow: true,
+    sortable: true,
+    customCell: sharedOnCell,
+  },
   {
     title: '船公司',
     align: 'left',
@@ -538,6 +551,20 @@ export const columns: BasicColumn[] = [
     dataIndex: 'loadGuaranteeFlagName',
     customCell: sharedOnCell1,
   },
+  {
+    title: '来源邮箱',
+    align: 'left',
+    width: 100,
+    dataIndex: 'senderEmail',
+    customCell: sharedOnCell1,
+  },
+  {
+    title: '接受邮箱',
+    align: 'left',
+    width: 100,
+    dataIndex: 'recvEmail',
+    customCell: sharedOnCell1,
+  },
   {
     title: '收货地',
     align: 'left',

src/views/operation/invoicExamine/columns.tsx

@@ -147,7 +147,7 @@ export const detailColumns: BasicColumn[] = [
   {
     title: '单位',
     dataIndex: 'unit',
-    width: 100,
+    width: 60,
     align: 'left',
   },
   {

src/views/operation/invoicExamine/index.vue

@@ -100,7 +100,7 @@
                 </a-tabs>
                 <div style="display: flex;" v-if="activeKey == 0">
                     <div class="left">
-                        <BasicTable class="ds-table" @register="registerTable2">
+                        <BasicTable @register="registerTable2">
 
                         </BasicTable>
                     </div>
@@ -208,7 +208,7 @@ import { useDesign } from '/@/hooks/web/useDesign'
 const { prefixCls } = useDesign('ds-table-button')
 const { createMessage } = useMessage()
 const [registerTable, { reload, getPaginationRef, getVxeSelectRows, getRawDataSource }] = useTable({
-    maxHeight: 225,
+    maxHeight: 215,
     api: async (p) => {
         const res: API.DataResult = await GetList(p)
         return new Promise((resolve) => {
@@ -238,7 +238,7 @@ const [registerTable, { reload, getPaginationRef, getVxeSelectRows, getRawDataSo
     },
     canResize: true,
     immediate: true,
-    resizeHeightOffset: 50,
+    resizeHeightOffset: 60,
     tableComponent: 'vxe',
     id: '0',
     autoHeight: window.innerHeight - 330.5
@@ -250,6 +250,7 @@ const [registerTable2, { getSelectRows: getSelectRows2, clearSelectedRowKeys: cl
     pagination: false,
     showIndexColumn: false,
     bordered: true,
+    maxHeight: 225,
     canResize: false,
     showSummary: true,
     summaryFunc(param) {
@@ -286,6 +287,7 @@ const [registerTable3, { setTableData: setTableDataFee }] = useTable({
     striped: true,
     rowKey: 'id',
     bordered: true,
+    maxHeight: 225,
     canResize: true,
     immediate: false,
 })
@@ -296,6 +298,7 @@ const [registerTable4, { setTableData: setTableDataFeeSum }] = useTable({
     pagination: false,
     showTableSetting: false,
     striped: true,
+    maxHeight: 225,
     rowKey: 'id',
     bordered: true,
     canResize: true,
@@ -345,7 +348,6 @@ function handleClick(row) {
         if (res.succeeded) {
             feeData.value = res.data
             setTableData(res.data.invoiceDetails)
-            // 
         }
         loading.value = false
     })
@@ -482,6 +484,7 @@ function sureRefuse() {
         color: black;
         display: inline-block;
         width: 200px;
+        flex: 1;
     }
 }
 
@@ -532,8 +535,10 @@ function sureRefuse() {
     background-color: white;
     border-radius: 6px;
     border: 1px solid rgba(204, 214, 223, 1);
-    padding: 14px 20px;
+    padding: 8px 20px;
     margin-top: 15px;
+    height: 360px;
+    padding-bottom: 10px;
 }
 </style>
 <style lang="less"></style>

src/views/system/serviceFlow/index.vue

@@ -31,14 +31,15 @@
             </template>
         </BasicTable>
         <editForm @handleSuccess="handleSuccess" ref="editFormRef" ></editForm>
+        <manyModel ref="manyModelRef" ></manyModel>
     </div>
 </template>
 <script lang="ts" setup name="服务流程台账">
 import { ref } from 'vue'
 import { GetList, SetUnEnable, SetEnable, Delete } from './api.js'
 import { BasicTable, useTable } from '/@/components/Table'
-import { BasicForm, useForm } from '/@/components/Form/index'
 import { columns, searchFormSchema, detailForm } from './columns'
+import manyModel from './manyModel.vue'
 import { useMessage } from '/@/hooks/web/useMessage'
 import editForm  from './detail.vue'
 const { createMessage } = useMessage()
@@ -82,6 +83,8 @@ function GoDetailed(type, row) {
         editFormRef.value.init(row.pkId)
     }
 }
+const manyModelRef = ref()
+
 function handleSuccess(){
     reload()
 }
@@ -101,6 +104,7 @@ function FnDel() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -118,6 +122,7 @@ function handleWithdraw() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -135,6 +140,7 @@ function handleApply() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }

src/views/system/serviceFlow/manyModel.vue

@@ -0,0 +1,62 @@
+<template>
+  <a-modal title="提示信息" width="1000px" :visible="bcFileFlag" :footer="null" @cancel="bcFileFlag = false">
+    <div class="bcfile-title">
+      <div><a-icon style="margin-right: 10px;" @click="handleCopy" type="copy" /></div>
+      <span> {{ bcFile.message }}</span>
+    </div>
+    <div ref="bcBox" class="bc-box" v-if="bcFile.data && bcFile.data.length > 0">
+      <div class="bc-item" v-for="(item, index) in bcFile.data" :key="index">
+        <span>{{ item.data }}</span>
+        <span v-if="item.succeeded"> 成功</span>
+        <span v-if="!item.succeeded"> 失败</span>
+      </div>
+    </div>
+    <div v-else>{{ bcFile.message }}</div>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, defineEmits } from 'vue'
+const bcFileFlag = ref(false)
+const bcFile = ref({}) as any
+const bcBox = ref()
+defineExpose({
+  init
+})
+function init(res) {
+  bcFileFlag.value = true
+  bcFile.value = res
+}
+function handleCopy() {
+  const text = bcBox.value.innerText
+  var cInput = document.createElement('input');
+  cInput.value = text;
+  document.body.appendChild(cInput);
+  cInput.select(); // 选取文本框内容
+  document.execCommand('copy');
+  document.body.removeChild(cInput);
+}
+</script>
+
+<style scoped lang="less">
+.bcfile-title {
+  border-bottom: 1px dashed black;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.bc-box {
+  max-height: 200px;
+  overflow-y: auto;
+  padding-right: 14px;
+
+  .bc-item {
+    margin: 7px 0px;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

src/views/system/serviceItemList/index.vue

@@ -40,6 +40,7 @@
                 </a-spin>
             </template>
         </a-modal>
+        <manyModel ref="manyModelRef" ></manyModel>
     </div>
 </template>
 <script lang="ts" setup name="服务项目台账">
@@ -50,6 +51,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'
 import { columns, searchFormSchema, detailForm } from './columns'
 import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
+import manyModel from '../serviceFlow/manyModel.vue'
 import { useGo } from '/@/hooks/web/usePage'
 const go = useGo()
 import { formatParams } from '/@/hooks/web/common'
@@ -72,7 +74,6 @@ const [registerTable, { reload, clearSelectedRowKeys, getVxeSelectRows }] = useT
     pagination: true,
     striped: true,
     useSearchForm: true,
-    resizeHeightOffset: 15,
     showTableSetting: true,
     bordered: true,
     canResize: true,
@@ -88,6 +89,7 @@ const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getF
     schemas: detailForm,
     showActionButtonGroup: false,
 })
+const manyModelRef = ref()
 function GoDetailed(type,row) {
     if (!type) {
         open.value = true
@@ -143,6 +145,7 @@ function FnDel() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -160,6 +163,7 @@ function handleWithdraw() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -177,6 +181,7 @@ function handleApply() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }

src/views/system/serviceStatus/index.vue

@@ -47,6 +47,7 @@
                 </a-spin>
             </template>
         </a-modal>
+        <manyModel ref="manyModelRef" ></manyModel>
     </div>
 </template>
 <script lang="ts" setup name="服务状态">
@@ -57,6 +58,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'
 import { columns, searchFormSchema, detailForm } from './columns'
 import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
+import manyModel from '../serviceFlow/manyModel.vue'
 import { useGo } from '/@/hooks/web/usePage'
 const go = useGo()
 import { formatParams } from '/@/hooks/web/common'
@@ -95,6 +97,7 @@ const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue, }]
     schemas: detailForm,
     showActionButtonGroup: false,
 })
+const manyModelRef = ref()
 function GoDetailed(type, row) {
     if (!type) {
         open.value = true
@@ -153,6 +156,7 @@ function FnDel() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -170,6 +174,7 @@ function handleWithdraw() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }
@@ -187,6 +192,7 @@ function handleApply() {
             createMessage.success('操作成功')
             clearSelectedRowKeys()
             reload()
+            manyModelRef.value.init(res)
         }
     })
 }