箱型表格bug

3 months ago · f813030de5
parent 6930ce8563
commit f813030de5
10 changed files with 67 additions and 28 deletions
--- a/index.html
+++ b/index.html
@ -10,7 +10,7 @@
    />
    <title><%= title %></title>
    <link rel="icon" href="/favicon.ico" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_j0sw6eo6ae.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_39sb3qu5lct.css" />
  </head>
  <body>
    <script>
--- a/src/design/ant/table.less
+++ b/src/design/ant/table.less
@ -68,6 +68,7 @@
    padding: 0px;
  }
 }
+
 .ant-table-thead {
  th {
    background-color: rgba(240, 244, 250, 1) !important;
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@ -79,7 +79,7 @@ getDictOption('seaexport_ctn_map').then((res) => {

 export const searchFormSchema: FormSchema[] = [
  {
-    field: 'customerNo:mblno:hblno',
+    field: 'customerNo:mblno:hblno:bookingNo:contractNo:customerNum',
    label: '编号查询',
    component: 'Input',
    // defaultValue: '',
@ -307,7 +307,7 @@ export const searchFormSchema: FormSchema[] = [
  },
  {
    field: 'contractNo',
-    label: '运费协议号',
+    label: '约号',
    component: 'Input',
    show: false
  },
@ -553,7 +553,13 @@ export const columns: BasicColumn[] = [
  },
  {
    dataIndex: 'contractNo',
-    title: '运费协议号',
+    title: '约号',
+    sorter: true,
+    width: 150,
+  },
+  {
+    dataIndex: 'customerNum',
+    title: '客户编号',
    sorter: true,
    width: 150,
  },
@ -1469,7 +1475,7 @@ export const BatchModificationFormSchema: FormSchema[] = [
  },
  {
    field: 'contractNo',
-    label: '运费协议号',
+    label: '约号',
    component: 'Input',
    required: false,
    dynamicDisabled: false,
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@ -124,7 +124,7 @@
            </transition>
            <transition name="slide">
              <rightContent
-                v-if="id"
+                v-if="id && !isOpenSet"
                class="right-content"
                ref="RefrightContent"
                :id="id"
@ -217,6 +217,7 @@
  
  import { useMultipleTabStore } from '/@/store/modules/multipleTab'
  import { Divider } from 'ant-design-vue'
+import { fastCall } from 'handsontable/helpers'
  
  const go = useGo()
  // 页面loading
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@ -57,15 +57,11 @@ const FntradeTerm = ref([])
 getDictOption('packing_type').then((res) => {
  FntradeTerm.value = res
 })
-// 单提份数字典
+// 单提份数/副本份数字典
 const FnnoBill = ref([])
 getDictOption('no_bill').then((res) => {
  FnnoBill.value = res
-})
-// 副本份数字典
-const FncopyNoBill = ref([])
-getDictOption('copy_no_bill').then((res) => {
-  FncopyNoBill.value = res
+  console.log(FnnoBill.value)
 })
 // 销售字典
 const salerCodeDict = ref([])
@ -210,11 +206,13 @@ export const basicInfoFormSchema: FormSchema[] = [
        mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE',
        onChange: (e, obj) => {
          if (e && obj) {
-            cno.value = e
+            cno.value = obj.contractNote
          }
        },
        onBlur: () => {
-          formActionType ? formActionType.linkageForm(cno) : null
+          if (cno.value) {
+            formActionType ? formActionType.linkageForm(cno) : null
+          }
        }
      }
    }
@ -1304,7 +1302,7 @@ export const noteFormSchema: FormSchema[] = [
    component: 'Select',
    required: false,
    dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
    colProps: { span: 5 },
    componentProps: {
      options: FnnoBill,
@ -1321,10 +1319,10 @@ export const noteFormSchema: FormSchema[] = [
    component: 'Select',
    required: false,
    dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
    colProps: { span: 5 },
    componentProps: {
-      options: FncopyNoBill,
+      options: FnnoBill,
      allowClear: true,
      showSearch: true,
      filterOption: (input: string, option: any) => {
@ -1716,9 +1714,10 @@ export const cargoInfoFormSchema2: FormSchema[] = [
    field: 'goodsName',
    label: '品名',
    component: 'ApiSelect',
+    labelSlot: 'goodsName',
    required: false,
    dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
    colProps: { span: 12 },
    componentProps: ({ formModel }) => {
      return {
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@ -212,7 +212,6 @@
  // 5.自动带出所属分部和所属部门
  // 6.自动带出服务项目。
  const linkageForm = async (item) => {
-    console.log(item)
    if (item.key == 'contractNo') {
      // 修改合约号增加备注
      emitter.emit('seaAddNotes', item.value)
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@ -36,7 +36,11 @@
            <BasicForm @register="registerForm1" class="goods-intro"/>
          </a-col>
          <a-col :span="9">
-            <BasicForm @register="registerForm2" @submit="submit" />
+            <BasicForm @register="registerForm2" @submit="submit">
+              <template #goodsName="{ model }">
+                <span class="iconfont icon-jichupeizhi"></span>
+              </template>
+            </BasicForm>
          </a-col>
        </a-row>
      </a-col>
@ -648,6 +652,11 @@
      height: 130px;
    }
  }
+  .icon-jichupeizhi {
+    float: right;
+    color: #257AFA;
+    cursor: pointer;
+  }
  .icon-30jiantouxiangxiafill {
    margin-left: 3px;
  }
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@ -1781,6 +1781,7 @@
        }
        // 计算箱量
        if (changes[0][1] === 'ctnNum') {
+          console.log(ctnDict.value)
          let RData = 0
          list.value.forEach((e) => {
            if (e.ctnNum) {
@ -1788,6 +1789,8 @@
            }
          })
          let teu = 0
+          const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
+          ctnDict.value = res
          ctnDict.value.forEach((item) => {
            if (item.ctnName == list.value[changes[0][0]]['ctn']) {
              teu = item.teu
@ -2020,6 +2023,10 @@
      max-height: 240px!important;
      min-height: 130px;
    }
+    .htCheckboxRendererInput {
+      position: relative;
+      z-index: 1111;
+    }
  }
 }
 </style>
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@ -211,7 +211,10 @@
        <div style="max-height: 182px; overflow: auto;">
          <div class="remark" v-for="(remark, rindex) in RemarkList" :key="rindex">
            <div class="remark-main">
-              <div class="top"><i class="iconfont icon-yuandian"></i>{{ remark.remark }}</div>
+              <div class="top flex">
+                <i class="iconfont icon-yuandian"></i>
+                <div v-html="remark.remark"></div>
+              </div>
            </div>
            <div class="remark-btn">
              <i class="iconfont icon-bianji1 mr15" @click="editRemark(remark)"></i>
@ -569,8 +572,12 @@
  function Getremark() {
    remarkSpinning.value = true
    GetSeaExportRemarkList({ id: props.id }).then((res) => {
+      const { data } = res
      remarkSpinning.value = false
-      RemarkList.value = res.data
+      data.forEach(item => {
+        if (item.remark) item.remark = item.remark.replace(/\n/g,'<br/>')
+      })
+      RemarkList.value = data
    })
  }
  //打开备注弹窗
@ -994,6 +1001,7 @@
  }
  onMounted(() => {
    emitter.on('seaAddNotes', (v) => {
+      console.log(v)
      if (!props.id) return
      if (RemarkList) {
        for (var i = 0; i < RemarkList.value.length; i++) {
@ -1002,16 +1010,17 @@
          }
        }
      }
+      if (!v) return
      EditSeaExportRemark({
        id: editRemarkVal.value ? editRemarkVal.value.id : 0,
        pId: props.id,
        remark: v,
      })
-        .then((res) => {
-          if (res.succeeded) {
-            Getremark()
-          }
-        })
+      .then((res) => {
+        if (res.succeeded) {
+          Getremark()
+        }
+      })
    })
  })
  defineExpose({
@ -1029,6 +1038,9 @@
      cursor: pointer;
    }
  }
+  .top {
+    justify-content: flex-start;
+  }
  position: relative;
  top: -40px;
  background: #ffffff;
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@ -377,7 +377,7 @@ const calcColumns = [
  },
 ]
 // 合计数据
-const calcData = ref([])
+const calcData = ref([{}])
 // 批量编辑 弹窗
 const [registerModal, { openModal }] = useModal()
 const [registerTable, { reload, getForm, setLoading, getSelectRows }] = useTable({
@ -613,6 +613,11 @@ onMounted(() => {
    color: #257afa;
    cursor: pointer;
  }
+  .ds-table {
+    .ant-table-body {
+      min-height: calc(100vh - 310px);
+    }
+  }
 }

 .compareIcon {