From 3cf36afacefeedc18c67f9a94cfcbe9906163e7a Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Wed, 29 May 2024 16:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CostEntry/actionBar.vue        |  3 +-
 src/components/CostEntry/feeTable.vue         |  4 +-
 src/design/public.less                        | 16 ++-
 src/styles/common.scss                        |  3 +
 src/utils/request.ts                          |  2 +-
 .../seaexport/detail/modules/basicInfo.vue    |  1 +
 .../seaexport/detail/modules/cargoInfo.vue    |  2 +
 .../seaexport/detail/modules/mailingInfo.vue  |  2 +
 .../seaexport/detail/modules/rightContent.vue |  2 +-
 .../seaexport/detail/style/basicInfo.less     |  2 +-
 .../seaexport/detail/style/billInfo.less      |  2 +-
 .../seaexport/detail/style/cargoInfo.less     | 38 -------
 .../seaexport/detail/style/index.less         | 82 +---------------
 .../seaexport/detail/style/mailingInfo.less   | 98 +------------------
 .../seaexport/detail/style/operationArea.less |  4 +-
 15 files changed, 34 insertions(+), 227 deletions(-)

diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index 702a41b1..a462ebe7 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -5,7 +5,7 @@
 -->
 <template>
   <div class="cost-action-bar">
-    <a-button type="link" size="mini" v-repeat @click="addRow">
+    <a-button type="link" size="mini" @click="addRow">
       <span class="iconfont icon-tianjia" :style="{ fontSize: '12px' }"></span>
       添加
     </a-button>
@@ -138,7 +138,6 @@
   const toFeeTemDrawer = ref(null)
   // 添加行
   const addRow = () => {
-    console.log(1)
     const deepCopyRow = JSON.parse(JSON.stringify(props.row))
     props.data.push(deepCopyRow)
   }
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index a304783a..3f891c87 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -571,7 +571,7 @@
   // 撤销提交
   const revoke = (ids) => {
     loading.value = true
-    Withdraw(ids).then(res => {
+    Withdraw({ ids }).then(res => {
       loading.value = false
       createMessage.success(res.message)
       init()
@@ -719,7 +719,7 @@
       }
     })
     // 数据初始化
-    init()
+    // init()
   })
   watchEffect(() => {
     // 全选
diff --git a/src/design/public.less b/src/design/public.less
index e939010e..23cf05c1 100644
--- a/src/design/public.less
+++ b/src/design/public.less
@@ -52,4 +52,18 @@
 
 .ant-modal {
   top: 30px!important;
-}
\ No newline at end of file
+}
+
+// 自定义最小输入框
+.ant-form-small {
+  .ant-input-affix-wrapper-sm, .ant-select-selector {
+    height: 28px!important;
+    .ant-select-selection-item {
+      line-height: 26px!important;
+    }
+  }
+  .ant-picker-small {
+    height: 28px;
+    width: 100%;
+  }
+}
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 594e5f0e..d7fa657f 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -69,6 +69,9 @@ h5 {
           line-height: 22px;
           font-size: 12px;
           color: #262626;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
     }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index bf60cbe2..3b65c280 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -71,7 +71,7 @@ service.interceptors.response.use(
       return response
     } else if (!res.succeeded) {
       $message.error(res.message || UNKNOWN_ERROR)
-      return response
+      // return response
       // // Illegal token
       // if (res.code === 11001 || res.code === 11002) {
       //   window.localStorage.clear();
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index de7112b8..ed78d9b2 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -580,6 +580,7 @@
     labelWidth: 80,
     schemas: basicInfoFormSchema,
     showActionButtonGroup: false,
+    size: 'small'
   })
   const emit = defineEmits(['handleSaveService', 'editLineName', 'changeDetail'])
   let { ctx: that, proxy }: any = getCurrentInstance()
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index b5113ec0..c523484b 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -653,6 +653,7 @@
     labelWidth: 80,
     schemas: cargoInfoFormSchema1,
     showActionButtonGroup: false,
+    size: 'small'
   })
   const [
     registerForm2,
@@ -667,6 +668,7 @@
     schemas: cargoInfoFormSchema2,
     showActionButtonGroup: false,
     submitFunc: submit,
+    size: 'small'
   })
   // const [
   //   registerForm3,
diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
index 203c4c26..88f410e1 100644
--- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
@@ -1152,6 +1152,7 @@
     labelWidth: 80,
     schemas: mailingInfoFormSchemaL,
     showActionButtonGroup: false,
+    size: 'small'
   })
   const [
     registerFormR,
@@ -1167,6 +1168,7 @@
     labelWidth: 80,
     schemas: mailingInfoFormSchemaR,
     showActionButtonGroup: false,
+    size: 'small'
   })
   let { ctx: that, proxy }: any = getCurrentInstance()
   const showKey = ref(['1'])
diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue
index 580719af..da623449 100644
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -1270,7 +1270,7 @@
     color: #666;
     height: 20px;
     cursor: pointer;
-    color: black;
+    color: #262626;
     background: #fff;
 
     .iconfont {
diff --git a/src/views/operation/seaexport/detail/style/basicInfo.less b/src/views/operation/seaexport/detail/style/basicInfo.less
index b1a799fc..0cf1c9d8 100644
--- a/src/views/operation/seaexport/detail/style/basicInfo.less
+++ b/src/views/operation/seaexport/detail/style/basicInfo.less
@@ -3,7 +3,7 @@
   overflow: hidden;
 }
 /deep/ .from-label label {
-  color: black;
+  color: #262626;
 }
 .from-box {
   border-bottom: 1px dashed #ccc;
diff --git a/src/views/operation/seaexport/detail/style/billInfo.less b/src/views/operation/seaexport/detail/style/billInfo.less
index aef83ce0..8ddeed0a 100644
--- a/src/views/operation/seaexport/detail/style/billInfo.less
+++ b/src/views/operation/seaexport/detail/style/billInfo.less
@@ -89,7 +89,7 @@
     padding-bottom: 10px;
   }
   .bill-info /deep/ label{
-    color: black;
+    color: #262626;
   }
   .bill-info-box{
     /deep/ .ant-row{
diff --git a/src/views/operation/seaexport/detail/style/cargoInfo.less b/src/views/operation/seaexport/detail/style/cargoInfo.less
index a754bb16..284b2614 100644
--- a/src/views/operation/seaexport/detail/style/cargoInfo.less
+++ b/src/views/operation/seaexport/detail/style/cargoInfo.less
@@ -250,41 +250,3 @@
     right: 0 !important;
   }
 }
-
-/deep/ .has-success .ant-select-selection-selected-value {
-  padding-right: 0 !important;
-}
-/deep/ .has-error .ant-select-selection-selected-value {
-  padding-right: 0 !important;
-}
-
-/deep/ .has-success .ant-select-arrow {
-  right: 8px !important;
-}
-/deep/ .has-error .ant-select-arrow {
-  right: 8px !important;
-}
-/deep/ .ant-select-selection__clear {
-  right: 10px !important;
-  margin-top: -4px !important;
-}
-
-/deep/ form .has-feedback :not(.ant-input-group-addon) > .ant-select .ant-select-selection__clear {
-  right: 10px !important;
-  margin-top: -4px !important;
-}
-
-/deep/ form .has-feedback .ant-input-affix-wrapper .ant-input-suffix {
-  right: 0px !important;
-  padding-right: 10px;
-}
-/deep/ form .has-feedback .ant-calendar-picker-icon,
-form .has-feedback .ant-time-picker-icon,
-form .has-feedback .ant-calendar-picker-clear,
-form .has-feedback .ant-time-picker-clear {
-  right: 10px !important;
-}
-
-/deep/ .ant-collapse-header {
-  padding: 4px 10px !important;
-}
diff --git a/src/views/operation/seaexport/detail/style/index.less b/src/views/operation/seaexport/detail/style/index.less
index 4fa95bc7..dec1c179 100644
--- a/src/views/operation/seaexport/detail/style/index.less
+++ b/src/views/operation/seaexport/detail/style/index.less
@@ -52,50 +52,6 @@
     }
   }
   
-  // .ant-calendar-picker-input{
-  //   padding: 0 4px;
-  // }
-  // .ant-calendar-range-picker-input{
-  //   height: 24px;
-  //   font-size: 12px;
-  //   vertical-align: top;
-  //   text-align: center;
-  //   // background: #f99;
-  // }
-  // .ant-select-auto-complete.ant-select .ant-input{
-  //   height: 28px !important;
-  //   // padding-top: 4px !important;
-  //   background: #f99 !important;
-  // }
-  .ant-input-affix-wrapper .ant-input:not(:last-child) {
-    height: 24px !important;
-    // margin-top: 4px !important;
-    // background: #9f9 !important;
-  }
-  .ant-select-selection {
-    height: 24px !important;
-    // margin-top: 4px !important;
-    // background: #f00 !important;
-  }
-  .ant-input:placeholder-shown {
-    height: 24px !important;
-    // margin-top: 4px !important;
-    // background: #99f !important;
-  }
-  .ant-calendar-picker-input.ant-input {
-    height: 24px !important;
-    // margin-top: 4px !important;
-  }
-  .ant-form-item-label {
-    // line-height: 30px !important;
-    // border: 1px solid #f00;
-  }
-  .ant-form-item-control-wrapper {
-    // border: 1px solid #f99;
-    // height: 30px;
-    // vertical-align: top;
-    // padding: 0;
-  }
   .left-box {
     // padding-top: 60px;
   }
@@ -110,43 +66,7 @@
     background: #fff;
     transition: 0.5s all;
   }
-  /deep/ form .has-success .ant-input {
-    padding-right: 0 !important;
-  }
-  /deep/ form .has-error .ant-input {
-    padding-right: 0 !important;
-  }
-  
-  /deep/ form .has-success .ant-calendar-picker-input {
-    padding-right: 0 !important;
-  }
-  
-  /deep/ form .has-feedback .ant-input {
-    padding-right: 10px !important;
-  }
-  
-  /deep/ .ant-select-selection__clear {
-    // margin-top: -3px !important;
-    // right: 16px !important;
-  }
-  
-  /deep/ form .has-feedback > .ant-select .ant-select-arrow,
-  form .has-feedback > .ant-select .ant-select-selection__clear,
-  form .has-feedback :not(.ant-input-group-addon) > .ant-select .ant-select-arrow,
-  form .has-feedback :not(.ant-input-group-addon) > .ant-select .ant-select-selection__clear {
-    right: 9px !important;
-  }
-  
-  /deep/ form .has-feedback .ant-input-affix-wrapper .ant-input-suffix {
-    right: 0px !important;
-  }
-  // /deep/ form .has-feedback .ant-calendar-picker-icon,
-  // form .has-feedback .ant-time-picker-icon,
-  // form .has-feedback .ant-calendar-picker-clear,
-  // form .has-feedback .ant-time-picker-clear {
-  //   right: 0px !important;
-  // }
-  
+ 
   // === 0217更新样式 ===
   .booking-detail {
     margin-top: 8px;
diff --git a/src/views/operation/seaexport/detail/style/mailingInfo.less b/src/views/operation/seaexport/detail/style/mailingInfo.less
index c32164b0..a956293e 100644
--- a/src/views/operation/seaexport/detail/style/mailingInfo.less
+++ b/src/views/operation/seaexport/detail/style/mailingInfo.less
@@ -381,19 +381,6 @@
   }
 }
 
-/deep/ .has-success .ant-select-selection-selected-value {
-  padding-right: 0 !important;
-}
-/deep/ .has-error .ant-select-selection-selected-value {
-  padding-right: 0 !important;
-}
-
-/deep/ .has-success .ant-select-arrow {
-  right: 8px !important;
-}
-/deep/ .has-error .ant-select-arrow {
-  right: 8px !important;
-}
 
 .text-entry-box {
   .tit {
@@ -427,43 +414,7 @@
     }
   }
 }
-/deep/ .ant-select-selection__clear {
-  right: 10px !important;
-  margin-top: -6px !important;
-}
 
-/deep/ form .has-feedback :not(.ant-input-group-addon) > .ant-select .ant-select-selection__clear {
-  right: 10px !important;
-  margin-top: -6px !important;
-}
-
-/deep/ form .has-feedback .ant-input-affix-wrapper .ant-input-suffix {
-  right: 0px !important;
-  padding-right: 10px;
-}
-/deep/ form .has-feedback .ant-calendar-picker-icon,
-form .has-feedback .ant-time-picker-icon,
-form .has-feedback .ant-calendar-picker-clear,
-form .has-feedback .ant-time-picker-clear {
-  right: 10px !important;
-}
-
-// .has-error.has-feedback{
-.pkgs-line-box {
-  /deep/ .ant-form-item-children-icon {
-    right: 18px !important;
-  }
-}
-.kgs-line-box {
-  /deep/ .ant-form-item-children-icon {
-    right: 44px !important;
-  }
-}
-.cbm-line-box {
-  /deep/ .ant-form-item-children-icon {
-    right: 48px !important;
-  }
-}
 
 .right-content-top {
   padding-bottom: 4px;
@@ -479,51 +430,4 @@ form .has-feedback .ant-time-picker-clear {
     height: 2px;
     border-bottom: 1px dashed #ddd;
   }
-}
-
-/deep/ .ant-input-suffix {
-  color: rgba(0, 0, 0, 0.25);
-  // display: none;
-}
-/deep/ .ant-input-affix-wrapper:hover {
-  .ant-input-suffix {
-    display: block;
-  }
-}
-
-/deep/ .ant-calendar-picker-clear {
-  color: rgba(0, 0, 0, 0.25) !important;
-}
-
-/deep/ .ant-collapse-header {
-  padding: 4px 10px !important;
-}
-
-/deep/ .ant-collapse-content-box {
-  padding-top: 4px !important;
-  padding-block: 0 !important;
-}
-
-.right-content {
-  padding-bottom: 5px;
-  /deep/ .ant-form-item-label {
-    height: 28px !important;
-    line-height: 28px !important;
-    // border: 1px solid #f00;
-  }
-  /deep/ .ant-form-item-control {
-    // height:36px !important;
-    line-height: 36px !important;
-  }
-}
-
-/deep/ .ant-calendar-picker-input {
-  height: 24px !important;
-  // margin-top: 4px !important;
-}
-
-/deep/ .right-content[data-v-27167ea2] .ant-form-item-control,
-.right-content[data-v-27167ea2] .ant-form-item-label {
-  height: 36px !important;
-  line-height: 36px !important;
-}
+}
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/style/operationArea.less b/src/views/operation/seaexport/detail/style/operationArea.less
index cabdcb5d..43b4ee16 100644
--- a/src/views/operation/seaexport/detail/style/operationArea.less
+++ b/src/views/operation/seaexport/detail/style/operationArea.less
@@ -65,7 +65,7 @@
       font-size: 14px;
       color: #666;
       cursor: pointer;
-      color: black;
+      color: #262626;
       background: #fff;
       .iconfont {
         font-size: 16px;
@@ -116,7 +116,7 @@
       cursor: not-allowed !important;
     }
     &.inLoad button:hover {
-      color: black !important;
+      color: #262626 !important;
     }
   }
   .single-view-4 {