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_5nvf0rgprqc.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_tfuuuqzywo8.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>

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

@@ -53,9 +53,7 @@
       </div>
     </a-card>
     <a-card :bodyStyle="tstyle" :bordered="false">
-      <div class="title">
+      <div class="title"><i class="iconfont icon-fujian-wenjian"></i><span>附件</span></div>
-        <i class="iconfont icon-fujian-wenjian"></i><span>附件</span>
-      </div>
       <div class="content">
         <a-button type="primary" class="file-btn" @click="addFile">新增附件</a-button>
         <div class="file" v-for="(file, findex) in fileList" :key="findex">
@@ -124,7 +122,7 @@
           </a-tree-node>
         </a-directory-tree> -->
         <div class="no-data" v-if="fileList.length === 0">
-          <i class="iconfont icon-wushuju"></i>
+          <i class="iconfont icon-queshengye_zanwushuju" :style="{ fontSize: '50px' }"></i>
           <div class="text">暂无动态</div>
         </div>
       </div>
@@ -132,7 +130,7 @@
     <a-collapse class="collapse-box" :bordered="false" expandIconPosition="right" v-model="showKey">
       <a-collapse-panel key="1">
         <template slot="header">
-          <div class="title" :style="{marginTop:'-10px'}"><i class="iconfont icon-rizhi"></i><span>日志</span></div>
+          <div class="title" :style="{ marginTop: '-10px' }"><i class="iconfont icon-rizhi"></i><span>日志</span></div>
         </template>
         <div class="cargo-info">
           <div class="info-header">
@@ -284,6 +282,7 @@ export default {
       immediate: true,
       handler(nD, oD) {
         if (!nD.id) {
+          this.BookingDetail = []
           this.bookingServiceItem = []
           this.fileList = []
           this.remarkList = []

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

@@ -37,7 +37,9 @@
                     <a-button class="more-search" @click="tableMoreRefresh"
                       >多提单号查询<a-icon type="search"
                     /></a-button>
-                    <span class="tab-btn" @click="formSetting"><a-icon type="setting" :style="{marginLeft:'0px'}" /></span>
+                    <span class="tab-btn" @click="formSetting"
+                      ><a-icon type="setting" :style="{ marginLeft: '0px' }"
+                    /></span>
                     <a class="senior-search" @click="toggleAdvanced">
                       {{ advanced ? '收起查询' : '更多查询' }}
                       <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
@@ -73,7 +75,10 @@
               style="margin-top:15px;"
             >
               <template #mblno="{ row }">
-                <div class="mblno">{{ row.mblno }}</div>
+                <div class="mblno">
+                  <span @click="editColumns(row)">{{ row.mblno }}</span>
+                  <a-icon class="CSMblnoCopy" type="copy" @click="FnCopy(row.mblno)" />
+                </div>
               </template>
               <template #vessel="{ row }">
                 <div class="vessel">{{ row.vessel }}</div>
@@ -236,6 +241,15 @@ export default {
   },
   methods: {
     ...mapActions(['setBookingList']),
+    FnCopy(data) {
+      const el = document.createElement('input')
+      el.setAttribute('value', data)
+      document.body.appendChild(el)
+      el.select()
+      document.execCommand('copy')
+      document.body.removeChild(el)
+      this.$message.success('复制成功!')
+    },
     init(queryParam = {}) {
       console.log(queryParam, 'queryParam')
       this.gridOptions.pagerConfig = {
@@ -509,7 +523,7 @@ export default {
     },
     addSubmit() {
       this.addVisible = false
-      this.$router.push({ name: 'BookingDetailAdd', query: { type: this.carrierRadio } })
+      this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio } })
     },
     addCancel() {
       this.addVisible = false
@@ -570,12 +584,19 @@ export default {
 </style>
 <style lang="less" scoped>
 /*订舱表格内字体颜色 */
-/*.mblno{
+.mblno {
   color: #3277ff;
+  span {
+    margin-right: 0.5rem;
+    cursor: pointer;
+  }
+  .CSMblnoCopy {
+    cursor: pointer;
+  }
 }
-.vessel {
+// .vessel {
-  color: #77c950;
+//   color: #77c950;
-}*/
+// }
 .nav-box {
   margin-bottom: 10px;
   padding: 0 10px;
@@ -775,8 +796,8 @@ export default {
   }
 }
 /*查询区日期默认颜色 */
-/deep/ .ant-calendar-today{
+/deep/ .ant-calendar-today {
-  .ant-calendar-date{
+  .ant-calendar-date {
     color: @primary-color !important;
     border-color: @primary-color !important;
   }