邮件发送

src/components/EmailModal.vue/index.vue

@@ -1,218 +0,0 @@
-<!--
- * @Author: lijj
- * @Date: 2024-05-06 09:18:47
- * @Description: 邮件发送弹窗组件
--->
-<template>
-  <div>
-    <a-modal 
-      class="ds-form-detail ds-modal-small"
-      v-model:visible="visible"
-      v-if="visible"
-      title="邮件发送"
-      width="640px"
-      :maskClosable="false"
-    >
-      <a-spin :spinning="loading">
-        <div>
-          <a-form
-            layout="vertical"
-            autocomplete="off"
-            class="ant-form-small"
-          >
-            <div class="flex" style="justify-content: space-between;">
-              <a-form-item
-                label="关键字"
-              >
-                <a-input v-model:value="name" @keyup.enter="search" style="width: 400px;"></a-input>
-              </a-form-item>
-              <div>
-                <a-button @click="reset">重 置</a-button>
-                <a-button @click="search" type="primary">查 询</a-button>
-              </div>
-            </div>
-          </a-form>
-        </div>
-        <div>
-          <h4>模版</h4>
-        </div>
-        <a-row :gutter="10">
-          <a-col :span="12" v-for="item in modelData" class="mb10" :key="item.id">
-            <div class="model-card">
-              <span class="tem-name">
-                {{ item.templateName }}
-              </span>
-              <span class="flex flex-btns">
-                <dl @click="toPrint(item.id, '1')">
-                  <dt><img src="../../assets/images/PDF2.png" alt=""></dt>
-                  <dd>pdf</dd>
-                </dl>
-                <dl @click="toPrint(item.id, '2', item.name)">
-                  <dt><img src="../../assets/images/xksx2.png" alt=""></dt>
-                  <dd>xlsx</dd>
-                </dl>
-                <dl @click="toPrint(item.id, '3')">
-                  <dt><img src="../../assets/images/DOC2.png" alt=""></dt>
-                  <dd>doc</dd>
-                </dl>
-              </span>  
-            </div>
-          </a-col>
-        </a-row>
-        <div v-show="!modelData.length" class="no-data">
-          <span class="iconfont icon-wushuju" :style="{ fontSize: '50px' }"></span>
-          <div class="mb10">暂无数据</div>
-        </div>
-      </a-spin>
-      <template #footer>
-      </template>
-    </a-modal>
-  </div>
-</template>
-
-<script lang="ts" setup name="DsPrint">
-  import { ref, defineExpose, defineProps } from 'vue'
-  import { GetOpenPrintTemplateList, GetOpenJsonPrintInfo } from '/@/views/operation/seaexport/api/BookingLedger.js'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  const { createMessage } = useMessage()
-  const props = defineProps({
-    // 模块id（根据id查询所有模版）
-    id: {
-      type: String,
-      default: null
-    }
-  })
-  // 关键字名称
-  const name = ref()
-  // 弹窗开关
-  const visible = ref(false)
-  const loading = ref(false)
-  // 打印格式
-  const type = ref('1')
-  // 打印模版数据
-  const modelData = ref([])
-  // 保存打印的数据
-  const jsonDataStr = ref()
-  // 附件原始数据
-  const sourceData = ref([])
-  // 组件初始化接口 (接收打印的数据list)
-  const init = (v) => {
-    visible.value = true
-    if (v) jsonDataStr.value = JSON.stringify(v)
-    loading.value = true
-    GetOpenPrintTemplateList({ id: props.id }).then(r => {
-      loading.value = false
-      // 保存原始数据
-      modelData.value = r.data
-      sourceData.value = JSON.parse(JSON.stringify(r.data))
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  // 重置
-  const reset = () => {
-    name.value = null
-    modelData.value = sourceData.value
-  }
-  // 查询
-  const search = () => {
-    if (!name.value) return reset()
-    const source = JSON.parse(JSON.stringify(sourceData.value))
-    modelData.value = source.filter(item => {
-      return item.templateName.includes(name.value)
-    })
-  }
-  const handleOk = () => {
-    visible.value = false
-  }
-
-  const handleCancel = () => {
-    visible.value = false
-  }
-
-  // 跳转打印
-  const toPrint = (id, type, name) => {
-    const postData = {
-      jsonDataStr: jsonDataStr.value,
-      printType: type,
-      templateId: id
-    }
-    loading.value = true
-    GetOpenJsonPrintInfo(postData).then(res => {
-      loading.value = false
-      if (!res.succeeded) {
-        createMessage.error(res.message)
-      } else {
-        let fileURL = `http://60.209.125.238:3009/PrintTempFile/${res.data}`
-        if (type == 1) {
-          window.open(fileURL)
-        } else {
-          window.open(`//60.209.125.238:3009/PrintTempFile/${res.data}`, '_blank')
-        }
-      }
-    })
-  }
-
-  defineExpose({
-    init
-  })
-</script>
-<style lang="less">
-  .ds-print {
-    .message {
-      font-size: 12px;
-      color: #f05;
-    }
-    .tem-name {
-      font-size: 12px;
-      color: #7A8798;
-    }
-    .ant-spin-container {
-      min-height: 270;
-    }
-    .model-card {
-      padding: 10px;
-      background: #F5F9FC;
-      border-radius: 2px;
-      border-left: 1px solid #257AFA;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-    .ant-modal-footer {
-      display: none;
-    }
-    .ant-btn {
-      width: 80px;
-      margin-left: 10px;
-      margin-top: 25px;
-    }
-    h4 {
-      margin: 16px 0 13px;
-    }
-    dt {
-      img {
-        width: 16px;
-        height: 18px;
-      }
-    }
-    dd {
-      font-size: 10px;
-      margin: 0;
-      color: #257AFA;
-    }
-    dl {
-      margin: 0 10px 0 7px;
-      cursor: pointer;
-    }
-    .flex-btns {
-      position: relative;
-      top: 2px;
-    }
-    .no-data {
-      text-align: center;
-      color: #7A8798;
-    }
-  }
-</style>
- 

src/components/EmailModal/api.ts

@@ -0,0 +1,41 @@
+/*
+ * @Author: lijingjia lijj_xl@163.com
+ * @Date: 2024-07-24 14:18:58
+ * @Description: 邮件发送api
+ */
+import { request } from '/@/utils/request'
+import { DataResult, PageRequest } from '/@/api/model/baseModel'
+import qs from "qs"
+enum Api {
+  GetUseEmailListByIds = '/mainApi/ClientCommon/GetUseEmailListByIds',
+  GetUserEmailSetInfo = '/mainApi/UserEmail/GetUserEmailSetInfo',
+  BatchDelFiles = '/mainApi/OpFile/BatchDelFiles'
+}
+// 根据id查询人员邮箱
+export function GetUseEmailListByIds(params) {
+  return request<DataResult>({
+    url: Api.GetUseEmailListByIds,
+    method: 'get',
+    params,
+    paramsSerializer: function (params) {  
+      return qs.stringify(params, { arrayFormat: "repeat" })
+    }
+  })
+}
+
+// 获取用户邮箱配置
+export function GetUserEmailSetInfo() {
+  return request<DataResult>({
+    url: Api.GetUserEmailSetInfo,
+    method: 'get'
+  })
+}
+
+// 附件删除
+export function BatchDelFiles(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.BatchDelFiles,
+    method: 'post',
+    data
+  })
+}

src/components/EmailModal/index.vue

@@ -0,0 +1,106 @@
+<!--
+ * @Author: lijj
+ * @Date: 2024-05-06 09:18:47
+ * @Description: 邮件发送弹窗组件
+-->
+<template>
+  <div>
+    <a-modal 
+      class="ds-form-detail ds-email-modal ds-modal-small"
+      v-model:visible="visible"
+      v-if="visible"
+      title="邮件发送"
+      width="640px"
+      :maskClosable="false"
+    >
+      <a-spin :spinning="loading">
+        <a-form
+          layout="vertical"
+          autocomplete="off"
+          class="ant-form-small"
+          :model="formData"
+        >
+          <a-form-item
+            label="抄送人"
+          >
+            <a-select
+              v-model:value="formData.CCTo"
+              mode="multiple"
+              placeholder="请选择"
+            >
+              <a-select-option v-for="item in receiveList" :key="item.id" :value="item.email">
+                {{ item.email }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-form>
+      </a-spin>
+      <template #footer>
+      </template>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup name="DsPrint">
+  import { ref, defineExpose, defineProps, reactive } from 'vue'
+  import { GetUseEmailListByIds, GetUserEmailSetInfo } from './api'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { createMessage } = useMessage()
+  const props = defineProps({
+    // 模块id（根据id查询所有模版）
+    id: {
+      type: String,
+      default: null
+    }
+  })
+  // 邮件发送表单数据
+  const formData = reactive({
+    SendTo: [],
+    CCTo: []
+  })
+  // 弹窗开关
+  const visible = ref(false)
+  const loading = ref(false)
+  // 收件人数据
+  const receiveList = ref([])
+  // 获取人员邮箱
+  const getEmail = (ids) => {
+    GetUseEmailListByIds({ ids }).then(res => {
+      if (res.succeeded) {
+        const list = res.data.filter(item => {
+          return item.email
+        })
+        receiveList.value = list
+      }
+    })
+  }
+  // 获取用户邮箱配置
+  const getEmailConfig = () => {
+    GetUserEmailSetInfo().then(res => {
+      console.log(res)
+    })
+  }
+  // 组件初始化接口
+  const init = (ids) => {
+    visible.value = true
+    getEmail(ids)
+    getEmailConfig()
+  }
+  const handleOk = () => {
+    visible.value = false
+  }
+
+  const handleCancel = () => {
+    visible.value = false
+  }
+
+  defineExpose({
+    init
+  })
+</script>
+<style lang="less">
+  .ds-email-modal {
+   
+  }
+</style>
+ 

src/components/Modal/src/index.less

@@ -38,7 +38,6 @@
       display: none;
     }
   }
-
   &-large {
     top: 60px;
 
@@ -105,7 +104,11 @@
     }
   }
 }
-
+.ant-modal-confirm {
+  .ant-modal-body {
+    padding: 20px 30px;
+  }
+}
 @media screen and (max-height: 600px) {
   .ant-modal {
     top: 60px;

src/design/ant/modal.less

@@ -18,19 +18,19 @@
   .scroll-container {
     padding: 0 30px!important;
   }
-  .ant-form {
+  // 所有弹窗下的表单样式
-    height: 100%;
+  .modal-card {
     background-color: #F5F9FC;
     border-radius: 2px;
     padding: 10px 20px 15px;
+  }
+  .ant-form {
+    height: 100%;
     .ant-form-item {
       margin-bottom: 0;
     }
     .ant-form-item-label {
       padding-bottom: 0;
-      >label {
-        font-size: 12px;
-      }
     }
   }
   .vben-basic-table {
@@ -38,10 +38,11 @@
       padding: 0;
     }
     .ant-table-title {
-      padding: 8px 0!important;
+      padding: 0!important;
     }
   }
 }
+
 .ant-modal-footer {
   border-top: none!important;
   padding: 5px 30px 20px;

src/design/public.less

@@ -187,7 +187,9 @@ h5 {
 .ml15 {
   margin-left: 15px;
 }
-
+.pl0 {
+  padding-left: 0!important;
+}
 // 表格状态使用
 .ds-green-tag,
 .ds-blue-tag,

src/views/baseinfo/infoclient/menu2/columns.tsx

@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
+import { getOptions } from '/@/hooks/dict'
 import { Tag } from 'ant-design-vue'
 export const columns: BasicColumn[] = [
   {
@@ -255,6 +256,46 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     defaultValue: '',
   },
+  {
+    label: '船公司名称',
+    field: 'carrier',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '船公司属性',
+    field: 'carrierId',
+    labelSlot: 'carrierId',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: () => {
+          return new Promise((resolve) => {
+            const arr = getOptions('carrier')
+            resolve(arr)
+          })
+        },
+        labelField: 'name',
+        showName: 'shortName',
+        valueField: 'id',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.carrier = obj.label
+          } else {
+            formModel.carrier = ''
+          }
+        },
+      }
+    },
+  },
   {
     field: 'isOperator',
     label: '是否为操作',

src/views/fee/template/components/feeField.vue

@@ -8,14 +8,20 @@
     <div class="flex">
       <h2>费用字段</h2>
       <div>
-        <a-button type="primary" size="small" @click="addRow">添加</a-button>
+        <a-button type="link" @click="addRow">
+          <span class="iconfont icon-new_document"></span>
+          添加
+        </a-button>
         <a-popconfirm
-          title="确定删除当前选中的费用字段？"
+          title="确定删除当前选中数据？"
           ok-text="是"
           cancel-text="否"
           @confirm="deleteRow"
         >
-          <a-button class="ml10" size="small" type="error">删除</a-button>
+          <a-button type="link">
+            <span class="iconfont icon-shanchu21"></span>
+            删除
+          </a-button>
         </a-popconfirm>
       </div>
     </div>
@@ -23,12 +29,7 @@
       <div style="position: relative">
         <input class="ds-tb-check" type="checkbox" v-model="allCheck" :indeterminate="someCheck" />
         <hot-table ref="hotTb" :data="list" :settings="settings">
-          <img
+          <img v-show="!list.length" src="../../../../assets/images/nodata.png" alt="">
-            v-show="!list.length"
-            class="hot-tb-no-data"
-            src="../../../../assets/images/nodata.png"
-            alt=""
-          />
         </hot-table>
       </div>
     </a-spin>
@@ -51,6 +52,8 @@
     GetFeeCodeSelectList,
     GetClientListByCode,
     GetFeeCurrencySelectList,
+    GetClientSelectInfoByCode,
+    GetUnitSelectInfo
   } from '/@/api/common'
   import { GetFeeTemplateDetailList, BatchDelFeeTemplateDetail } from '../api'
   // 引入计费标准字典
@@ -120,11 +123,6 @@
       className: 'htCenter',
       readOnly: false,
     },
-    {
-      title: '序号',
-      width: 130,
-      readOnly: true,
-    },
     {
       title: '费用名称',
       width: 130,
@@ -134,8 +132,9 @@
       source: async (query, process) => {
         const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data
         if (!feeDict.value.length) feeDict.value = res
+        console.log(res)
         const dict = res.map((res) => {
-          return res.name
+          return res.code + '-' + res.name
         })
         process(dict)
       },
@@ -154,6 +153,20 @@
         process(dict)
       },
     },
+    {
+      title: '客户类别',
+      width: 130,
+      data: 'customerTypeText',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const results = await getDictOption('djy_cust_prop')
+        console.log(results)
+        const dict = results.map((item) => {
+          return item.value + '-' + item.name
+        })
+        process(dict)
+      },
+    },
     {
       title: '结算对象',
       width: 130,
@@ -161,9 +174,8 @@
       type: 'dropdown',
       source: async (query, process) => {
         // 获取当前选中行
-        const rowIndex = hotTb.value.hotInstance.countRows()
+        const rowIndex = hotTb.value.hotInstance.getActiveEditor().row
-        const code = list.value[rowIndex - 1].customerType
+        const code = list.value[rowIndex]?.customerType || null
-        if (code) {
         GetClientListByCode({ code }).then((res) => {
           const { data } = res
           data.forEach((item) => {
@@ -172,26 +184,10 @@
           })
           companyDict.value = data
           const dict = data.map((item) => {
-              return item.shortName
+            return item.codeName + '-' + item.shortName
           })
           process(dict)
         })
-        } else {
-          process([])
-        }
-      },
-    },
-    {
-      title: '客户类别',
-      width: 130,
-      data: 'customerTypeText',
-      type: 'dropdown',
-      source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
-        const dict = results.map((item) => {
-          return item.name
-        })
-        process(dict)
       },
     },
     {
@@ -202,23 +198,23 @@
       source: async (query, process) => {
         if (unitDict.value && unitDict.value.length) {
           const dict = unitDict.value.map((item) => {
-            return item.name
+            return item.value + '-' + item.name
           })
           process(dict)
         } else {
           const results = await feeUnitDict()
           unitDict.value = results
           const dict = results.map((item) => {
-            return item.name
+            return item.value + '-' + item.name
           })
           process(dict)
         }
       },
     },
     {
-      title: '不含税单价',
+      title: '税率',
       width: 120,
-      data: 'noTaxPrice',
+      data: 'taxRate',
       type: 'numeric',
     },
     {
@@ -236,10 +232,11 @@
       format: '0',
     },
     {
-      title: '金额',
+      title: '不含税单价',
       width: 120,
-      data: 'amount',
+      data: 'noTaxPrice',
       type: 'numeric',
+      readOnly: true,
     },
     {
       title: '不含税金额',
@@ -247,24 +244,14 @@
       data: 'noTaxAmount',
       type: 'numeric',
       format: '0.00',
+      readOnly: true,
     },
     {
-      title: '税率',
+      title: '金额',
-      width: 120,
-      data: 'taxRate',
-      type: 'numeric',
-    },
-    {
-      title: '汇率',
       width: 120,
-      data: 'exchangeRate',
+      data: 'amount',
       type: 'numeric',
     },
-    {
-      title: '备注',
-      width: 120,
-      data: 'note',
-    },
     {
       title: '币别',
       width: 80,
@@ -283,12 +270,35 @@
         }
       },
     },
+    {
+      title: '汇率',
+      width: 120,
+      data: 'exchangeRate',
+      type: 'numeric',
+    },
+    {
+      title: '备注',
+      width: 120,
+      data: 'note',
+    },
     {
       title: '销项税率',
       width: 100,
       data: 'accTaxRate',
       type: 'numeric',
     },
+    {
+      title: '销项税额',
+      width: 100,
+      data: 'accTaxAmount',
+      readOnly: true,
+    },
+    {
+      title: '销项金额',
+      width: 100,
+      data: 'accAmount',
+      readOnly: true,
+    },
     {
       title: '是否机密',
       width: 100,
@@ -314,21 +324,84 @@
       type: 'dropdown',
       source: ['PP', 'CC'],
     },
+    {
+      title: '录入人',
+      width: 100,
+      data: 'createByName',
+      readOnly: true,
+    },
+    {
+      title: '录入日期',
+      width: 100,
+      data: 'createTime',
+      readOnly: true,
+    },
+    {
+      title: '结算金额',
+      width: 100,
+      data: 'settlementAmount',
+      readOnly: true,
+    },
+    {
+      title: '已开票金额',
+      width: 100,
+      data: 'invoiceAmount',
+      readOnly: true,
+    },
+    {
+      title: '对账编号',
+      width: 100,
+      data: 'debitNo',
+      readOnly: true,
+    },
+    {
+      title: '修改人',
+      width: 100,
+      data: 'updateByName',
+      readOnly: true,
+    },
+    {
+      title: '修改日期',
+      width: 100,
+      data: 'updateTime',
+      readOnly: true,
+    },
+    {
+      title: '发票申请金额',
+      width: 100,
+      data: 'orderInvoiceAmount',
+      readOnly: true,
+    },
+    {
+      title: '未开票金额',
+      width: 100,
+      data: 'debitNo',
+      readOnly: true,
+    },
+    {
+      title: '审核人',
+      width: 100,
+      data: 'auditOperator',
+      readOnly: true,
+    },
+    {
+      title: '审核日期',
+      width: 100,
+      data: 'auditDate',
+      readOnly: true,
+    },
   ]
   // 表格配置项
   const settings = {
-    height: '400',
+    height: 300,
     width: '100%',
     autoWrapRow: true,
     autoWrapCol: true,
     // 每行的高度
     rowHeights: 32,
     fixedColumnsLeft: 1,
-    // 需要隐藏的列
+    // 控制回车移动
-    hiddenColumns: {
+    enterMoves: 'row',
-      columns: [1],
-      indicators: true,
-    },
     columnSorting: true,
     // 设置排序的列和方向
     // columnSorting: {
@@ -339,12 +412,16 @@
     afterValidate: function (isValid, value, row, prop, source) {
       if (!isValid) {
         hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
+        // if (/^noTaxPrice|unitPrice|noTaxAmount|taxRate|exchangeRate$/.test(prop)) {
+        //   if (!isNaN(value)) {
+        //     hotTb.value.hotInstance.setDataAtRowProp(row, prop, value.toFixed(2))
+        //   }
+        // }
       }
     },
     columns: columns,
     // 此行直接复制，必须(非商用)
     licenseKey: 'non-commercial-and-evaluation',
-    enterMoves: 'row',
     // 定义所有单元格发生变化的回调处理
     afterChange(changes, source) {
       // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
@@ -355,9 +432,10 @@
           if (res[1] === 'feeName') {
             // 获取当前选中的字典对象数据
             const item = feeDict.value.filter((item) => {
-              return item.name === changes[0][3]
+              return changes[0][3].includes(item.name)
             })
             if (item) dict = item[0]
+            list.value[res[0]]['feeName'] = changes[0][3].split('-')[1]
             list.value[res[0]]['feeEnName'] = dict['enName']
             list.value[res[0]]['currency'] = dict['defaultCurrency']
             list.value[res[0]]['unitText'] = dict['defaultUnitName']
@@ -375,23 +453,53 @@
         // 修改费用英文名称
         if (changes[0][1] === 'feeEnName') {
         }
+        // 修改费用对象
+        if (changes[0][1] === 'customerName') {
+          const item = companyDict.value.filter((item) => {
+            return changes[0][3].includes(item.name)
+          })
+          if (item) dict = item[0]
+          list.value[changes[0][0]]['customerCode'] = dict?.value
+          list.value[changes[0][0]]['customerName'] = changes[0][3].split('-')[1]
+          console.log(changes[0][3])
+        }
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
           getDictOption('djy_cust_prop').then((res) => {
             const item = res.filter((item) => {
-              return item.name === changes[0][3]
+              return changes[0][3].includes(item.name)
             })
             if (item) dict = item[0]
             list.value[changes[0][0]]['customerType'] = dict?.value
+            list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
           })
         }
         // 修改单位
         if (changes[0][1] === 'unitText') {
           const item = unitDict.value.filter((item) => {
-            return item.name === changes[0][3]
+            return changes[0][3].includes(item.name)
           })
           if (item) dict = item[0]
           list.value[changes[0][0]]['unit'] = dict?.value
+          list.value[changes[0][0]]['unitText'] = changes[0][3].split('-')[1]
+          // 业务数据有件数，修改单位，带出件数
+          // const text = list.value[changes[0][0]]['unitText']
+          // if (text == '单票') {
+          //   list.value[changes[0][0]]['quantity'] = 1
+          // } else if (text == '件数') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.pkgs
+          // } else if (text == '重量') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.kgs
+          // } else if (text == '尺码') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.cbm
+          // } else if (text == '计费吨') {
+          //   let r = props.details.kgs
+          //   const k = (props.details.pkgs || 0) / 1000
+          //   if (k > r) {
+          //     r = k
+          //   }
+          //   list.value[changes[0][0]]['quantity'] = r
+          
         }
         // 修改币别
         if (changes[0][1] === 'currencyName') {
@@ -406,57 +514,78 @@
         // 修改不含税单价计算
         if (changes[0][1] === 'noTaxPrice') {
           // 单价
-          list.value[index].unitPrice =
+          list.value[index].unitPrice = Number(
-            (changes[0][3] || 0) * ((list.value[index].taxRate || 0) / 100 + 1)
+            (changes[0][3] || 0) * ((list.value[index].taxRate || 0) / 100 + 1),
+          ).toFixed(6)
           // 金额
-          list.value[index].amount =
+          list.value[index].amount = Number(
-            (list.value[index].unitPrice || 0) * (list.value[index].quantity || 0)
+            (list.value[index].unitPrice || 0) * (list.value[index].quantity || 0),
+          ).toFixed(6)
           // 不含税金额
-          list.value[index].noTaxAmount = (changes[0][3] || 0) * (list.value[index].quantity || 0)
+          list.value[index].noTaxAmount = Number(
+            (changes[0][3] || 0) * (list.value[index].quantity || 0),
+          ).toFixed(6)
         }
         // 修改单价计算
         if (changes[0][1] === 'unitPrice') {
           // 不含税单价
-          list.value[index].noTaxPrice =
+          list.value[index].noTaxPrice = Number(
-            (changes[0][3] || 0) / ((list.value[index].taxRate || 0) / 100 + 1)
+            (changes[0][3] || 0) / ((list.value[index].taxRate || 0) / 100 + 1),
+          ).toFixed(6)
           // 金额
-          list.value[index].amount = (changes[0][3] || 0) * (list.value[index].quantity || 0)
+          list.value[index].amount = Number(
+            (changes[0][3] || 0) * (list.value[index].quantity || 0),
+          ).toFixed(6)
           // 不含税金额
-          list.value[index].noTaxAmount =
+          list.value[index].noTaxAmount = Number(
-            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0)
+            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0),
+          ).toFixed(6)
         }
         // 修改数量
         if (changes[0][1] === 'quantity') {
           // 金额
-          list.value[index].amount = (changes[0][3] || 0) * (list.value[index].unitPrice || 0)
+          list.value[index].amount = Number(
+            (changes[0][3] || 0) * (list.value[index].unitPrice || 0),
+          ).toFixed(6)
           // 不含税金额
-          list.value[index].noTaxAmount = (changes[0][3] || 0) * (list.value[index].noTaxPrice || 0)
+          list.value[index].noTaxAmount = Number(
+            (changes[0][3] || 0) * (list.value[index].noTaxPrice || 0),
+          ).toFixed(6)
         }
         // 修改税率
         if (changes[0][1] === 'taxRate') {
           // 不含税单价
-          list.value[index].noTaxPrice =
+          list.value[index].noTaxPrice = Number(
-            (list.value[index].unitPrice || 0) / ((changes[0][3] || 0) / 100 + 1)
+            (list.value[index].unitPrice || 0) / ((changes[0][3] || 0) / 100 + 1),
+          ).toFixed(6)
           // 不含税金额
-          list.value[index].noTaxAmount =
+          list.value[index].noTaxAmount = Number(
-            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0)
+            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0),
+          ).toFixed(6)
         }
       }
     },
   }
-  const setTableData = () => {
-    const data = inject('temFieldData')
-    if (data) {
-      list.value = data.value
-      hotTb.value.hotInstance.loadData(data.value)
-    }
-  }
   defineExpose({
     validate,
   })
+  // 需要定义新增的行数据（后台需要）
+  const row = {
+    selected: false,
+    feeStatus: '1',
+    feeStatusText: '录入状态',
+    id: '',
+    businessId: '',
+    feeCode: '',
+    feeName: '',
+    feeEnName: '',
+    quantity: 1,
+    exchangeRate: 1,
+    feeType: props.tbType == 'receive' ? 1 : 2,
+  }
   onMounted(() => {
-    setTableData()
     const hot = hotTb.value.hotInstance
+    hot.addHook('afterOnCellMouseDown', function (event, coords, TD) {})
     // 定义表格按键处理逻辑
     hot.addHook('beforeKeyDown', function (event) {
       // 检查按下的是否是特定的键（例如 'Enter'）
@@ -464,7 +593,7 @@
         if (hot.getSelected()[0][0] == list.value.length - 1 && !hot.getActiveEditor()?._opened) {
           list.value.push(JSON.parse(JSON.stringify(row)))
           nextTick(() => {
-            hot.selectCell(list.value.length - 1, 3)
+            hot.selectCell(list.value.length - 1, 4)
           })
           return false
         }
@@ -531,9 +660,11 @@
           { FieldName: 'TemplateId', FieldValue: v, ConditionalType: 1 },
         ]),
       }
+      if (v) {
         const res = await GetFeeTemplateDetailList(postData)
         list.value = res.data
         hotTb.value.hotInstance.loadData(res.data)
+      }
     },
   )
   watchEffect(() => {

src/views/operation/seaexport/api/BookingLedger.js

@@ -2015,3 +2015,12 @@ export function GetOrderContactListByClientId(params) {
     params
   })
 }
+
+// 根据id获取往来单位参数信息
+export function GetClientParamListById(params) {
+  return request({
+    url: '/mainApi/ClientCommon/GetClientParamListById',
+    method: 'get',
+    params
+  })
+}

src/views/operation/seaexport/api/SendCar.js

@@ -209,11 +209,12 @@ export function BookingTruckGetYardData(parameter) {
 /**
  * 获取场站数据
  */
-export function TaskManageTruckGetYardData(parameter) {
+export function TaskManageTruckGetYardData(param) {
+  console.log(param)
+  const url = '/TaskManageTruck/GetYardData?ids=' + param[0] + '&ids=' + param[1]
   return request({
-    url: '/TaskManageTruck/GetYardData',
+    url,
-    method: 'get',
+    method: 'get'
-    params: parameter,
   })
 }
 /**

src/views/operation/seaexport/detail/components/ladingInfo.vue

@@ -709,7 +709,15 @@
     loading.value = true
     EditSeaExportBillManage(postData).then(res => {
       loading.value = false
+      if (res.succeeded) {
         createMessage.success('保存成功！')
+        if (res.data && res.data.length) {
+          state.rowKeys = [res.data]
+        }
+        setFieldsValue1({
+          id: res.data
+        })
+      }
       reload()
     })
   }

src/views/operation/seaexport/detail/index.vue

@@ -26,6 +26,7 @@
             <div class="auto">
               <a-spin :spinning="loading">
                 <operationArea
+                  :id="id"
                   :details="bookingDetails"
                   :inChildLoading="inChildLoading"
                   @refresh="refreshPage"

src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx

@@ -1,5 +1,4 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
-import { Tag } from 'ant-design-vue'
 import { useOptionsStore } from '/@/store/modules/options'
 import Space from '/@/views/operation/seaexport/components/Space.vue'
 import { useComponentRegister } from '/@/components/Form'
@@ -10,42 +9,42 @@ export const columns: BasicColumn[] = [
   {
     title: '通知人',
     dataIndex: 'toName',
-    width: 150,
+    width: 100,
   },
   {
     title: '联系人',
     dataIndex: 'toAttn',
-    width: 150,
+    width: 100,
   },
   {
     title: 'ATTN电话',
     dataIndex: 'toAttnTel',
-    width: 150,
+    width: 110,
   },
   {
     title: 'ATTN传真',
     dataIndex: 'toAttnFax',
-    width: 150,
+    width: 110,
   },
   {
     title: 'ATTN邮箱',
     dataIndex: 'toAttnEmail',
-    width: 150,
+    width: 110,
   },
   {
     title: '通知人',
     dataIndex: 'fromName',
-    width: 150,
+    width: 110,
   },
   {
     title: 'FROM电话',
     dataIndex: 'fromTel',
-    width: 150,
+    width: 110,
   },
   {
     title: 'FROM手机号',
     dataIndex: 'fromMobile',
-    width: 150,
+    width: 110,
   },
   {
     title: 'FROM传真',
@@ -231,7 +230,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 24,
+      span: 12
     },
   },
   {
@@ -240,7 +239,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 4,
+      span: 6
     },
   },
   {
@@ -249,7 +248,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -258,7 +257,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -267,16 +266,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
-    },
-  },
-  {
-    label: '',
-    field: 'Space1',
-    component: 'Space',
-    defaultValue: '',
-    colProps: {
-      span: 5,
     },
   },
   {
@@ -285,7 +275,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 4,
+      span: 6
     },
   },
   {
@@ -294,7 +284,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -303,7 +293,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -312,7 +302,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -321,7 +311,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6
     },
   },
   {
@@ -338,7 +328,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 24,
+      span: 12
     },
   },
   {
@@ -348,7 +338,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     show: false,
     colProps: {
-      span: 6,
+      span: 6
     },
   },
   // 单证Id
@@ -499,15 +489,6 @@ export const formSchema: FormSchema[] = [
       span: 6,
     },
   },
-  {
-    label: '',
-    field: 'Space2',
-    component: 'Space',
-    defaultValue: '',
-    colProps: {
-      span: 12,
-    },
-  },
   {
     label: '件重尺',
     field: 'pkc',

src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardDetails.vue

@@ -6,12 +6,12 @@
     width="90%"
     @register="registerModal"
   >
-    <a-row>
+    <a-row :gutter="16">
       <a-col :span="6">
         <BasicTable @register="registerOpBusinessYardTable" @row-click="onRowClick">
           <template #tableTitle>
             <div class="buttonGroup">
-              <a-button type="link" @click="FnClickAdd">
+              <a-button type="link" @click="FnClickAdd" class="pl0">
                 <span class="iconfont icon-new_document"></span>
                 新建
               </a-button>

src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue

@@ -1,7 +1,12 @@
+<!--
+ * @Author: lijingjia lijj_xl@163.com
+ * @Date: 2024-07-17 08:39:51
+ * @Description: 场站如果编辑组件
+-->
 <template>
   <div class="MainBox">
     <div class="buttonGroup">
-      <a-button type="link" @click="handleSave">
+      <a-button type="link" @click="handleSave" class="pl0">
         <span class="iconfont icon-baocun"></span>
         保存
       </a-button>

src/views/operation/seaexport/detail/modules/PersonModal.vue

@@ -5,6 +5,7 @@
     :title="getTitle"
     width="50%"
     class="person-modal"
+    :zIndex="1211"
     @register="registerModal"
     @ok="handleSave"
   >

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -10,7 +10,8 @@ import {
   GetDeptList,
   GetPackageSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
-
+// 兄弟传参，订舱代理变化使用
+import emitter from '/@/utils/Bus'
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
 const LockType = [
@@ -740,14 +741,13 @@ export const basicInfoFormSchema: FormSchema[] = [
           })
         },
         labelField: 'name',
-        valueField: 'codeName',
+        valueField: 'id',
         showName: 'shortName',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
-          console.log(e, obj)
           if (obj) {
             formModel.forwarder = obj.label
           } else {

src/views/operation/seaexport/detail/modules/basicInfo.vue

@@ -96,6 +96,7 @@
   import { ref, watch } from 'vue'
   import { GetBusinessOrderContactList } from '/@/views/operation/seaexport/api/BookingLedger'
   import { useMessage } from '/@/hooks/web/useMessage'
+  import { formatParams } from '/@/hooks/web/common'
   import PersonModal from './PersonModal.vue'
   const { createMessage } = useMessage()
   import { useModal } from '/@/components/Modal'
@@ -124,23 +125,8 @@
       })
     },
     beforeFetch: (p) => {
-      var currentPageInfo: any = getPaginationRef()
+      p['businessId'] = props.details.id
-      const postParam = {
+      return formatParams(p)
-        queryCondition: '',
-        pageCondition: {
-          pageIndex: currentPageInfo.current,
-          pageSize: currentPageInfo.pageSize,
-          sortConditions: [],
-        },
-      }
-      let condition: API.ConditionItem[] = []
-      condition.push({
-        FieldName: 'businessId',
-        FieldValue: props.details.id,
-        ConditionalType: 1,
-      })
-      postParam.queryCondition = JSON.stringify(condition)
-      return postParam
     },
     columns: personColumns,
     isTreeTable: false,

src/views/operation/seaexport/detail/modules/operationArea.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="operation-area">
-    <a-button type="link" @click="openModel('bookingSpace')">
+    <a-button v-repeat type="link" @click="openModel('bookingSpace')">
       <span class="iconfont icon-gongdanqueren"></span>
       订舱
     </a-button>
@@ -238,6 +238,7 @@
       @cancel="handleModelCancel"
     >
       <template v-if="['bookingSpace', 'cutOff'].includes(modelType)">
+        <div class="modal-card">
           <a-form
             layout="vertical"
             class="ds-form-detail"
@@ -253,6 +254,7 @@
               </a-radio-group>
             </a-form-item>
           </a-form>
+        </div>
       </template>
       <template v-else-if="['initCabin', 'ladingBill', 'vgmlink'].includes(modelType)">
         <div class="model-btn-list" v-if="modelType === 'initCabin' || modelType === 'ladingBill'">
@@ -790,53 +792,6 @@
         <a-button @click="handleModelCancel">关闭</a-button>
       </template>
     </a-modal>
-    <!-- 打印弹窗 start -->
-    <a-modal
-      :zIndex="1005"
-      width="45vw"
-      :maskClosable="false"
-      v-model:visible="PrintModalVisible"
-      title="打印"
-    >
-      <template #footer> <span></span> </template>
-      <a-spin tip="数据加载中..." :spinning="spinning">
-        <BasicTable @register="registerTable" :dataSource="dataSource">
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'action'">
-              <TableAction
-                :actions="[
-                  {
-                    icon: 'ant-design:file-pdf-outlined',
-                    tooltip: 'pdf',
-                    onClick: FnCilckTemplateType.bind(null, {
-                      templateId: record.id,
-                      printType: 1,
-                    }),
-                  },
-                  {
-                    icon: 'ant-design:file-excel-outlined',
-                    tooltip: 'excel',
-                    onClick: FnCilckTemplateType.bind(null, {
-                      templateId: record.id,
-                      printType: 2,
-                    }),
-                  },
-                  {
-                    icon: 'ant-design:file-word-outlined',
-                    tooltip: 'word',
-                    onClick: FnCilckTemplateType.bind(null, {
-                      templateId: record.id,
-                      printType: 3,
-                    }),
-                  },
-                ]"
-              />
-            </template>
-          </template>
-        </BasicTable>
-      </a-spin>
-    </a-modal>
-    <!-- 打印弹窗 end -->
     <!-- OCR抽屉 start -->
     <a-drawer
       title="OCR"
@@ -885,6 +840,7 @@
       v-model:visible="traceModalVisible"
       title="运踪订阅"
     >
+      <div class="modal-card">
         <a-form
           ref=traceRef
           class="ds-detail-form"
@@ -903,6 +859,7 @@
             />
           </a-form-item>
         </a-form>
+      </div>
       <template #footer>
         <a-button @click="traceModalVisible = false">关闭</a-button>
         <a-button :loading="tloading" type="primary" @click="traceSend">订阅</a-button>
@@ -910,6 +867,8 @@
     </a-modal>
     <!-- 预配舱单 -->
     <pre-order ref="RefpreOrder" :details="details" @frompre="frompre" />
+    <!-- 邮件发送弹窗 -->
+    <EmailModal ref="emailModal"></EmailModal>
   </div>
 </template>
 <script lang="ts" setup>
@@ -918,6 +877,8 @@
   import OpBusinessYardDetails from './Letter/OpBusinessYardDetails.vue'
   // 派车信息组件
   import OpBusinessTruckDetails from './Letter/OpBusinessTruckDetails.vue'
+  // 邮件发送组件
+  import EmailModal from '/@/components/EmailModal/index.vue'
   import {
     GetOpenPrintModuleList,
     GetOpenPrintTemplateList,
@@ -936,7 +897,8 @@
     CancelAllocationSlot,
     GetOcrText,
     SendTrace,
-    SubmitTelex
+    SubmitTelex,
+    GetClientParamListById
   } from '/@/views/operation/seaexport/api/BookingLedger.js'
    import { Divider } from 'ant-design-vue'
   import { BookingTruckGetTruckListByBooking } from '/@/views/operation/seaexport/api/SendCar.js'
@@ -966,6 +928,7 @@
     'SetOCR',
   ])
   const props = defineProps({
+    // 海运出口详情数据
     details: {
       type: Object,
       default: {},
@@ -978,9 +941,13 @@
       type: Boolean,
       default: false,
     },
+    // 业务id
+    id: {
+      type: String
+    }
   })
   // =============
-  const id = ref(route.query.id)
+  const id = ref(props.id)
   const spinning = ref(false)
   const PrintModalVisible = ref(false)
   const forwarderFlag = ref(false)
@@ -1053,7 +1020,7 @@
   const voltaFlag = ref(false)
   const voltaData = ref([])
   const bookingModelFrom = reactive({
-    id: route.query.id,
+    id: props,
     orderNo: props.details.mblno,
     useForwarderCode: false,
     forwarderCode: '',
@@ -1180,10 +1147,12 @@
         spinning.value = false
       })
   }
+  // 邮件发送组件
+  const emailModal = ref(null)
   function openModel(type) {
     forwarderFlag.value = false
     if (['initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
-      if (!route.query.id) {
+      if (!props.id) {
         notification.error({ message: '请保存主单后，进行操作', duration: 3 })
         return false
       }
@@ -1194,20 +1163,28 @@
       cateCode.value = 'fangcang'
     }
     if (['bookingSpace', 'cutOff', 'initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
+      // 订舱
       if (type === 'bookingSpace') {
-        if (localStorage.getItem('pro__DICT_TYPE_TREE_DATA')) {
+        const id = props.details.forwarderId
-          const data = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA') || '')
+        // 根据订舱代理id获取往来单位参数
-          data.value.forEach((item) => {
+        GetClientParamListById({ id }).then(res => {
-            if (item.code === 'EdiPipelineRelation') {
+          const { data } = res
-              if (item.children[0].name == props.details.forwarder) {
+          const Email = data.filter(item => {
-                forwarderFlag.value = true
+            return item.itemCode == 'EMAIL'
-              }
-            }
           })
-        }
+          if (Email.length) {
-      }
+            const ids = []
+            if (props.details.saleId) ids.push(props.details.saleId)
+            if (props.details.operatorId) ids.push(props.details.operatorId)
+            // 发送邮件
+            emailModal.value.init(ids)
+          } else {
+            // EDI弹窗
             modelType.value = type
             bookingModelvisible.value = true
+          }
+        })
+      }
     } else if (['vgm', 'paper'].includes(type)) {
       openDialog(type)
     } else if (type === 'trace') {
@@ -1291,7 +1268,7 @@
         }
         bookingModelFrom.send = type === 'send'
         bookingModelFrom.orderNo = props.details.mblno
-        bookingModelFrom.id = route.query.id
+        bookingModelFrom.id = props.id
         if (type == 'save') {
           // 保存EDI文件
           EDISloading.value = true
@@ -1383,7 +1360,7 @@
         return createMessage.warning('请选择船公司！')
       }
       const query = {
-        businessId: route.query.id,
+        businessId: props.id,
         mblno: props.details.mblno,
         yard: traceForm.traceValue.includes('1') ? props.details.yard : '',
         yardCode: traceForm.traceValue.includes('1') ? props.details.yardId : '',
@@ -1784,7 +1761,7 @@
     //   this.$message.error('加载中，请稍后')
     //   return false
     // }
-    if (!route.query.id) {
+    if (!props.id) {
       notification.error({ message: '请先保存订单', duration: 3 })
       return false
     }
@@ -1824,7 +1801,7 @@
     EDISloading.value = false
     EDIUloading.value = false
     Object.assign(bookingModelFrom, {
-      id: route.query.id,
+      id: props.id,
       orderNo: props.details.mblno,
       useForwarderCode: false,
       forwarderCode: '',
@@ -1864,7 +1841,7 @@
   const telxLoad = ref(false)
   function handleSubmitTelex() {
     telxLoad.value = true
-    SubmitTelex({ ids: [route.query.id] }).then((res) => {
+    SubmitTelex({ ids: [props.id] }).then((res) => {
       if (res.succeeded) {
         if (res.data[0].isSuccess) {
           notification.success({ message: '提交成功', duration: 3 })