修改服务项目报错

1 year ago · f8f72eb497
parent 4391785b29
commit f8f72eb497
7 changed files with 533 additions and 22 deletions
--- a/public/iconfont.css
+++ b/public/iconfont.css
@ -0,0 +1,503 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3756681 */
+  src: url('iconfont.woff2?t=1696823314659') format('woff2'),
+       url('iconfont.woff?t=1696823314659') format('woff'),
+       url('iconfont.ttf?t=1696823314659') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-return:before {
+  content: "\e6ba";
+}
+
+.icon-fanhui:before {
+  content: "\e61d";
+}
+
+.icon-xiajiantou:before {
+  content: "\ee2a";
+}
+
+.icon-zhuanwan:before {
+  content: "\e61b";
+}
+
+.icon-jiantoushuang:before {
+  content: "\e628";
+}
+
+.icon-bold-arrow-down-full:before {
+  content: "\ea5f";
+}
+
+.icon-jiantouxia:before {
+  content: "\e65b";
+}
+
+.icon-shanchu2:before {
+  content: "\e6de";
+}
+
+.icon-guanli:before {
+  content: "\e619";
+}
+
+.icon-a-wendangcaozuoxiazaishangchuanshanchuxinzengfujianyasuochakan-01:before {
+  content: "\e8bb";
+}
+
+.icon-jinggao1:before {
+  content: "\e618";
+}
+
+.icon-zhuanhuan:before {
+  content: "\e617";
+}
+
+.icon-shuaxin1:before {
+  content: "\e667";
+}
+
+.icon-gongdanqueren:before {
+  content: "\ec36";
+}
+
+.icon-31zhuanfa:before {
+  content: "\e610";
+}
+
+.icon-52:before {
+  content: "\e634";
+}
+
+.icon-touzijilu:before {
+  content: "\e616";
+}
+
+.icon-zidingyi:before {
+  content: "\eb6a";
+}
+
+.icon-dengjizongshu:before {
+  content: "\e62c";
+}
+
+.icon-duibi:before {
+  content: "\e871";
+}
+
+.icon-weibiaoti--:before {
+  content: "\e621";
+}
+
+.icon-xiazai:before {
+  content: "\e660";
+}
+
+.icon-xiazai-wenjianxiazai-13:before {
+  content: "\e856";
+}
+
+.icon-xiazai-wenjianxiazai-16:before {
+  content: "\e857";
+}
+
+.icon-xiaoyoujiantou:before {
+  content: "\ee29";
+}
+
+.icon-daoda:before {
+  content: "\e64b";
+}
+
+.icon-icon_xinyong_xianxing_jijin-217:before {
+  content: "\e65d";
+}
+
+.icon-queshengye_zanwudongtai:before {
+  content: "\e75f";
+}
+
+.icon-gengduo:before {
+  content: "\e60f";
+}
+
+.icon-fuzhi2:before {
+  content: "\e8b1";
+}
+
+.icon-zengjia:before {
+  content: "\e6ea";
+}
+
+.icon-chenggong:before {
+  content: "\e64d";
+}
+
+.icon-xiazaishibai:before {
+  content: "\e6b3";
+}
+
+.icon-shibai:before {
+  content: "\e87c";
+}
+
+.icon-tongzhi:before {
+  content: "\e60e";
+}
+
+.icon-yuanxuankuang2:before {
+  content: "\e664";
+}
+
+.icon-jia:before {
+  content: "\e659";
+}
+
+.icon-zhankai2:before {
+  content: "\e63c";
+}
+
+.icon-jian:before {
+  content: "\e60a";
+}
+
+.icon-liebiao:before {
+  content: "\e658";
+}
+
+.icon-liebiao1:before {
+  content: "\e609";
+}
+
+.icon-shijian1:before {
+  content: "\e615";
+}
+
+.icon-yonghu-yuan:before {
+  content: "\e625";
+}
+
+.icon-leixing:before {
+  content: "\e635";
+}
+
+.icon-yuandian:before {
+  content: "\e608";
+}
+
+.icon-beizhu1:before {
+  content: "\e665";
+}
+
+.icon-rizhi:before {
+  content: "\e64a";
+}
+
+.icon-ERP_zhuyi:before {
+  content: "\e64c";
+}
+
+.icon-fuwu:before {
+  content: "\e673";
+}
+
+.icon-zhuyi:before {
+  content: "\e633";
+}
+
+.icon-fujian-wenjian:before {
+  content: "\e60d";
+}
+
+.icon-lightning-full:before {
+  content: "\e995";
+}
+
+.icon-fujian:before {
+  content: "\ee16";
+}
+
+.icon-Excel:before {
+  content: "\e6df";
+}
+
+.icon-icon_bangzhuwendang:before {
+  content: "\eb92";
+}
+
+.icon-file-word:before {
+  content: "\e7ba";
+}
+
+.icon-tupian:before {
+  content: "\e8ba";
+}
+
+.icon-pdf:before {
+  content: "\e67a";
+}
+
+.icon-yulan:before {
+  content: "\e631";
+}
+
+.icon-arrow-:before {
+  content: "\e626";
+}
+
+.icon-fenxiang:before {
+  content: "\e8b0";
+}
+
+.icon-goods:before {
+  content: "\e76a";
+}
+
+.icon-a-fahuodaifahuo:before {
+  content: "\e638";
+}
+
+.icon-electronic-signature:before {
+  content: "\e840";
+}
+
+.icon-lianjie:before {
+  content: "\e60c";
+}
+
+.icon-xiugai:before {
+  content: "\e620";
+}
+
+.icon-shezhi:before {
+  content: "\e622";
+}
+
+.icon-shuaxin:before {
+  content: "\e62b";
+}
+
+.icon-duoxuan:before {
+  content: "\e630";
+}
+
+.icon-ccaozuo:before {
+  content: "\e739";
+}
+
+.icon-left-1:before {
+  content: "\e604";
+}
+
+.icon-right-1-copy:before {
+  content: "\e61f";
+}
+
+.icon-xia:before {
+  content: "\e63d";
+}
+
+.icon-del:before {
+  content: "\e605";
+}
+
+.icon-zhoubao:before {
+  content: "\e661";
+}
+
+.icon-duoxuan1:before {
+  content: "\e696";
+}
+
+.icon-jinggao:before {
+  content: "\e651";
+}
+
+.icon-dingdan:before {
+  content: "\e65c";
+}
+
+.icon-zhcc_tidan:before {
+  content: "\e682";
+}
+
+.icon-icon_baocun:before {
+  content: "\eb8e";
+}
+
+.icon-yunfei:before {
+  content: "\e77c";
+}
+
+.icon-tuodong:before {
+  content: "\e657";
+}
+
+.icon-daibanshixiang:before {
+  content: "\ec4e";
+}
+
+.icon-fuzhi11:before {
+  content: "\ec7a";
+}
+
+.icon-fapiaoguanli:before {
+  content: "\e624";
+}
+
+.icon-wj-bccl:before {
+  content: "\e70d";
+}
+
+.icon-tuandui:before {
+  content: "\e612";
+}
+
+.icon-shang:before {
+  content: "\e792";
+}
+
+.icon-dayinxiaopiao:before {
+  content: "\e627";
+}
+
+.icon-zhizhishu:before {
+  content: "\e613";
+}
+
+.icon-guanbi:before {
+  content: "\e606";
+}
+
+.icon-guanbi1:before {
+  content: "\e607";
+}
+
+.icon-beizhu:before {
+  content: "\e614";
+}
+
+.icon-chuanbo:before {
+  content: "\e68b";
+}
+
+.icon-shiyongwendang:before {
+  content: "\ea3d";
+}
+
+.icon-touxiang:before {
+  content: "\e611";
+}
+
+.icon-yunshu1:before {
+  content: "\e637";
+}
+
+.icon-bianji1:before {
+  content: "\e61c";
+}
+
+.icon-OCR:before {
+  content: "\e694";
+}
+
+.icon-printing:before {
+  content: "\ea28";
+}
+
+.icon-chuanfanguanli-chuanfanshenqing:before {
+  content: "\e648";
+}
+
+.icon-bianji:before {
+  content: "\e61a";
+}
+
+.icon-a-xiaopiaofapiao-01:before {
+  content: "\e79f";
+}
+
+.icon-wushuju:before {
+  content: "\e642";
+}
+
+.icon-meiyoudingdan:before {
+  content: "\e623";
+}
+
+.icon-queshengye_zanwushuju:before {
+  content: "\e760";
+}
+
+.icon-icon_tianjia:before {
+  content: "\eb89";
+}
+
+.icon-shanchu:before {
+  content: "\e603";
+}
+
+.icon-shanchu1:before {
+  content: "\e8b6";
+}
+
+.icon-shouqi:before {
+  content: "\e601";
+}
+
+.icon-zhankai:before {
+  content: "\e602";
+}
+
+.icon-shouqi1:before {
+  content: "\e655";
+}
+
+.icon-zhankai1:before {
+  content: "\e656";
+}
+
+.icon-jiahao2fill:before {
+  content: "\e728";
+}
+
+.icon-bianjiwenjian:before {
+  content: "\e600";
+}
+
+.icon-fuzhi:before {
+  content: "\e632";
+}
+
+.icon-xiaopiaodayin:before {
+  content: "\e61e";
+}
+
+.icon-fuzhi1:before {
+  content: "\e775";
+}
+
+.icon-shishijifei:before {
+  content: "\e6a1";
+}
+
+.icon-copy:before {
+  content: "\e644";
+}
+
+.icon-shujushangchuan-shixin:before {
+  content: "\e709";
+}
+
+.icon-shijian:before {
+  content: "\e60b";
+}
+
--- a/public/iconfont.ttf
+++ b/public/iconfont.ttf
--- a/public/iconfont.woff
+++ b/public/iconfont.woff
--- a/public/iconfont.woff2
+++ b/public/iconfont.woff2
--- a/public/index.html
+++ b/public/index.html
@ -95,7 +95,8 @@
    <% 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_qbc103sjo2g.css" />
+    <!-- <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" /> -->
+    <link rel="stylesheet" href="iconfont.css">
    <!-- 1.8K仔百度收录 -->
    <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
  </head>
@ -119,6 +120,7 @@
    <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
    <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
    <% } %>
+    <!-- <script src="iconfont.js"></script> -->
    <!-- built files will be auto injected -->
  </body>
 </html>
--- a/src/views/main/BookingLedger/detail/modules/rightContent.vue
+++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue
@ -579,9 +579,6 @@ export default {
    '$route.query': {
      immediate: true,
      handler(nD, oD) {
-        if (this.$route.query.isCopy) {
-
-        }
        if (this.$route.name === 'BookingDetail') {
          this.id = this.$route.query.id
          setTimeout(() => {
@ -720,8 +717,13 @@ export default {
    },
    init() {
      this.bookingAttachType = this.$options.filters['dictData']('booking_attach_type')
+      if (this.$route.query.id && !this.$route.query.isCopy) {
        this.getServiceItemList(1)
        this.getStatusServiceList(1)
+      } else {
+        this.bookingServiceItem = []
+        this.booGoodsStatusItem = []
+      }
    },
    getStatusServiceList(type, code) {
      const data = {
@ -753,7 +755,7 @@ export default {
          }
          this.booGoodsStatusItem = res.data.ext
        } else {
-          this.$message.error(res.message)
+          this.$message.error(res.data.msg)
        }
        this.spinning = false
      })
@ -769,7 +771,7 @@ export default {
          if (res.data.succ) {
            this.bookingServiceItem = res.data.ext
          } else {
-            this.$message.error(res.msg)
+            this.$message.error(res.data.msg)
          }
          this.seriveLoading = false
        })
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@ -347,7 +347,7 @@
                        <div v-if="row.lstDraftCompareRlt == 'DIFF'">
                          <a-icon type="close-circle" :style="{ color: 'red' }" />
                        </div>
-                        <div v-else-if="row.lstDraftCompareRlt == 'NO_DIFF'">
+                        <div v-else-if="row.lstDraftCompareRlt == 'NO DIFF'">
                          <a-icon type="check-circle" :style="{ color: '#54bc25' }" />
                        </div>
                      </div>
@ -598,9 +598,9 @@
          <a-button key="back" @click="formatSheetVisible = false"> 关闭 </a-button>
        </template>
        <div style="display: flex;">
-          <div :style="{width:formatSheet.total>0 ? '55%' : '25%'}">
-            <div v-if="formatSheet.total>0">
-              <div style="display: flex;justify-content: space-between;" class="TaskShippingOrderCompareP">
+          <div style="width:55%">
+            <div >
+              <div v-if="formatSheet.total>0" style="display: flex;justify-content: space-between;" class="TaskShippingOrderCompareP">
                <div>
                  {{ formatSheet.compareTime }}
                  <span v-if="formatSheet.isExistsDiff">
@ -612,7 +612,17 @@
                <div>显示全部
                  <a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
              </div>
-              <div v-if="!formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
+              <div style="display: flex;align-items: flex-start;" v-else >
+                <a-icon style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;" type="check-circle" theme="filled" />
+                <div style="margin-left: 20px;">
+                  <div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
+                  <div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
+                  <div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
+                </div>
+                <div style="margin:5px 0px 0px 40px">显示全部
+                  <a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
+              </div>
+              <div v-if="!formatFlag && formatSheet.total>0" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
                <div class="TaskShippingOrderCompareMain">
                  <div class="TaskShippingOrderCompareMainHeader">
                    <div>
@ -677,7 +687,8 @@
                  </div>
                </div>
              </div>
-              <div v-else class="TaskShippingOrderCompareMainBox" style="height: 600px;">
+              <div v-if="!formatFlag && formatSheet.total==0"></div>
+              <div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
                <div class="TaskShippingOrderCompareMain">
                  <div class="TaskShippingOrderCompareMainHeader">
                    <div>
@ -755,14 +766,7 @@
                </div>
              </div>
            </div>
-            <div v-else style="display: flex;align-items: flex-start;">
-              <a-icon style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;" type="check-circle" theme="filled" />
-              <div style="margin-left: 20px;">
-                <div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
-                <div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
-                <div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
-              </div>
-            </div>
+
          </div>
          <a-spin class="padUrl" style="width: 100%;min-height: 600px;" :spinning="pdfLoading">
            <iframe style="width: 100%;height: 100%;" :src="formatPdf" frameborder="0"></iframe>