Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

public/index.html

@@ -95,7 +95,7 @@
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_ytjy4xelr9r.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_sqw8em8u0p.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -102,9 +102,10 @@
             <a-col :span="10">
               <a-form-item
                 label="文件功能"
-                :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
+                class="ant-form-file"
               >
                 <a-radio-group v-model="bookingModelFrom.fileRole">
                   <a-radio :style="radioStyle" :value="9"> 原始 </a-radio>
@@ -125,7 +126,7 @@
       <template v-else-if="['initCabin', 'ladingBill', 'vgmlink'].includes(modelType)">
         <a-form>
           <a-row :gutter="16">
-            <div class="item-box">
+            <div class="item-box to-box" :style="{paddingTop:'0px'}">
               <!-- to -->
               <a-col :span="24">
                 <a-form-item
@@ -133,6 +134,7 @@
                   :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                   has-feedback
+                  :style="{marginLeft:'-18px'}"
                 >
                   <a-input :allowClear="true" placeholder="请输入内容" v-model="initCabinFrom.toName" />
                 </a-form-item>
@@ -200,7 +202,7 @@
               </a-col>
             </div>
             <template v-if="modelType === 'initCabin'">
-              <div class="item-box">
+              <div class="item-box cabin-box" :style="{paddingTop:'0px'}">
                 <a-col :span="24">
                   <a-form-item
                     label="提箱小票链接"
@@ -215,7 +217,7 @@
                         placeholder="请输入提箱小票链接"
                         v-model="initCabinFrom.orderUrl.urlTxxp"
                       />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlTxxp)">复制</span>
+                      <span @click="copyFun(initCabinFrom.orderUrl.urlTxxp)"><i class="iconfont icon-fuzhi2"></i></span>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -233,7 +235,7 @@
                         placeholder="请输入VGM链接"
                         v-model="initCabinFrom.orderUrl.urlVgm"
                       />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgm)">复制</span>
+                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgm)"><i class="iconfont icon-fuzhi2"></i></span>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -251,7 +253,7 @@
                         placeholder="请输入SI&VGM链接"
                         v-model="initCabinFrom.orderUrl.urlVgmSi"
                       />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgmSi)">复制</span>
+                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgmSi)"><i class="iconfont icon-fuzhi2"></i></span>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -1247,13 +1249,15 @@ export default {
   }
   span {
     display: inline-block;
-    width: 60px;
+    width: 25px;
     text-align: right;
     height: 32px;
     line-height: 32px;
     font-size: 13px;
-    color: @primary-color;
     cursor: pointer;
+    i{
+      color: @primary-color;
+    }
   }
 }
 .item-box {
@@ -1267,6 +1271,11 @@ export default {
     margin-bottom: 0;
   }
 }
+.cabin-box,.to-box{
+  .ant-row{
+    margin-bottom: 10px;
+  }
+}
 .book-model-box {
   position: relative;
   padding-left: 50px;
@@ -1276,7 +1285,7 @@ export default {
     height: 40px;
     line-height: 40px;
     top: 0;
-    left: 0;
+    left: 17px;
   }
 }
 .pdf-view {
@@ -1308,4 +1317,19 @@ export default {
     margin: 5px 10px;
   }
 }
+/*订舱弹窗文件功能对齐 */
+/deep/ .ant-form-file{
+  .ant-form-item-label{
+    margin-top: -5px;
+    margin-left:12px;
+  }
+}
+/*弹窗按钮颜色修改 */
+/deep/ .ant-modal-footer .ant-btn.ant-btn-primary span{
+  color: #FFF;
+}
+/*弹窗文本框背景颜色修改 */
+/deep/ .ant-modal-body .ant-input{
+  background: #f5f9fe;
+}
 </style>

src/views/main/BookingLedger/list/index.vue

@@ -76,7 +76,7 @@
                 <div class="vessel">{{ row.vessel }}</div>
               </template>
               <template #operate="{ row }">
-                <vxe-button type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
+                <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
               </template>
             </vxe-grid>
           </div>
@@ -757,4 +757,12 @@ export default {
 /deep/ .vxe-table--render-default .vxe-body--row.row--stripe {
   background: #f5f9fe;
 }
+/*列表操作按钮颜色 */
+/deep/ .operate-btn{
+  color: @primary-color;
+}
+/deep/ .operate-btn:hover{
+  color: @primary-color !important;
+  opacity: .7;
+}
 </style>