Browse Source

Merge branch 'develop_yh40' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh40

chenrui 1 year ago
parent
commit
484be65956

+ 1 - 0
public/index.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     <link rel="icon" href="<%= BASE_URL %>logo.png">
     <title><%= VUE_APP_PRO_NAME %></title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>

+ 6 - 10
src/views/Home.vue

@@ -119,16 +119,12 @@ export default {
         isEnable: 1
       })
       // 收款事由
-      vm.$store.state.app.bookReason = [
-        { dispName: '品牌货款', code: '0' },
-        { dispName: '轮胎货款', code: '1' },
-        { dispName: '品牌+轮胎货款', code: '2' },
-        { dispName: '蓄电池直发货款', code: '3' },
-        { dispName: '品牌+授信款还款', code: '4' },
-        { dispName: '转置还款', code: '5' },
-        { dispName: '分期还款', code: '6' },
-        { dispName: '品牌+分期还款', code: '7' }
-      ]
+      vm.getLookUpDataByCode({
+        code: 'FINANCE_BOOK_REASON',
+        key: 'bookReason',
+        isEnable: 1
+      })
+
       // 菜单数据
       vm.getYyMenuList()
       vm.$store.state.app.priceAuthOptions = [

+ 22 - 21
src/views/salesManagement/receiptPrint/printModel.vue

@@ -21,53 +21,54 @@
                     <table border="1" style="width: 564pt;border-collapse: collapse;text-align: center;">
                       <tr>
                         <th style="width: 36pt;background:#f6f6f6;">日期</th>
-                        <th style="background:#f6f6f6;" :style="{width:!hideBookReson?'60pt':'90pt'}">客户名称</th>
-                        <th style="background:#f6f6f6;" :style="{width:!hideBookReson?'60pt':'90pt'}">营业执照<br>名称</th>
-                        <th style="width: 52pt;background:#f6f6f6;">订单金额</th>
-                        <th style="width: 52pt;background:#f6f6f6;">收款金额</th>
-                        <th style="width: 52pt;background:#f6f6f6;">使用授信</th>
-                        <th style="width: 52pt;background:#f6f6f6;">余款抵扣</th>
-                        <th style="width: 52pt;background:#f6f6f6;">汇入银行</th>
-                        <th style="width: 36pt;background:#f6f6f6;">足额<br>打款</th>
-                        <th style="width: 52pt;background:#f6f6f6;">说明</th>
-                        <th style="width: 60pt;background:#f6f6f6;" v-if="!hideBookReson">收款事由</th>
+                        <th style="background:#f6f6f6;width: 82pt;">客户名称</th>
+                        <th style="background:#f6f6f6;width: 82pt;">营业执照<br>名称</th>
+                        <th style="width: 53pt;background:#f6f6f6;">订单金额</th>
+                        <th style="width: 53pt;background:#f6f6f6;">收款金额</th>
+                        <th style="width: 53pt;background:#f6f6f6;">使用授信</th>
+                        <th style="width: 53pt;background:#f6f6f6;">余款抵扣</th>
+                        <th style="width: 53pt;background:#f6f6f6;">汇入银行</th>
+                        <th style="width: 37pt;background:#f6f6f6;">足额<br>打款</th>
+                        <th style="width: 64pt;background:#f6f6f6;">说明</th>
                       </tr>
                       <tr v-for="item in fcItem.subList" :key="item.bookDetailSn">
                         <td style="padding:3pt 1pt;width: 34pt;">{{ item.receiptDate.split('-')[0] }}<br>{{ item.receiptDate.split('-')[1]+'/'+item.receiptDate.split('-')[2] }}</td>
-                        <td style="padding:3pt 1pt;word-break:break-all;" :style="{width:!hideBookReson?'58pt':'88pt'}">
+                        <td style="padding:3pt 1pt;width: 80pt;word-break:break-all;">
                           {{ item.payerName }}
                           <div>
                             {{ item.dealerEntity ? item.dealerEntity.kdMidCustomerFnumber : '' }}
                           </div>
                         </td>
-                        <td style="padding:3pt 1pt;word-break:break-all;" :style="{width:!hideBookReson?'58pt':'88pt'}">
+                        <td style="padding:3pt 1pt;width: 80pt;word-break:break-all;">
                           {{ item.payerAccountInfo }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 51pt;text-align:center;">
                           {{ item.orderAmount?item.orderAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 51pt;text-align:center;">
                           {{ item.receiptAmount?item.receiptAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 51pt;text-align:center;">
                           {{ getTotal(item.detailItemUseList||[]) }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 51pt;text-align:center;">
                           {{ item.balanceAmount?item.balanceAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 50pt;">
+                        <td style="padding:3pt 1pt;width: 51pt;">
                           {{ item.bankAccount }}<br>
                           {{ item.bankName }}
                         </td>
-                        <td style="padding:3pt 1pt;width: 34pt;">{{ item.fullPaymentFlagDictValue }}</td>
-                        <td style="padding:3pt 1pt;width: 50pt;word-break:break-all;">{{ item.explainInfo }}</td>
-                        <td style="padding:3pt 1pt;width: 58pt;word-break:break-all;" v-if="!hideBookReson">{{ item.bookReason }}</td>
+                        <td style="padding:3pt 1pt;width: 35pt;">{{ item.fullPaymentFlagDictValue }}</td>
+                        <td style="padding:3pt 1pt;width: 62pt;word-break:break-all;">{{ item.explainInfo }}</td>
                       </tr>
                     </table>
-                    <div style="padding:5pt 0;border-bottom: 1px solid #333;overflow:hidden;">
+                    <div style="padding:5pt 0;border-bottom: 1px solid #999;overflow:hidden;">
                       <div style="width:49%;display:flex;float:left;">使用授信明细:<div>{{ fcItem.detail||'暂无' }}</div></div>
                       <div style="width:49%;display:flex;float:right;">授信还款明细:<div>{{ fcItem.payDetail||'暂无' }}</div></div>
                     </div>
+                    <div style="padding:5pt 0;border-bottom: 1px solid #999;overflow:hidden;" v-if="!hideBookReson">
+                      收款事由:{{ fcItem.subList[0]['bookReason']||'暂无' }}
+                    </div>
                     <div style="padding:5pt 0;">
                       审批人员:{{ fcItem.audit||'暂无' }}
                     </div>

+ 4 - 10
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -120,8 +120,8 @@
             <a-col :span="16">
               <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:22}">
                 <div style="line-height:26px;">
-                  <div v-for="item in form.attachmentList" :key="item.id" @click="dowloadExcel(item.filePath)">
-                    <a href="#">{{ item.fileName }}</a>
+                  <div v-for="item in form.attachmentList" :key="item.id">
+                    <a href="javascript:;" @click="openLink(item.filePath)">{{ item.fileName }}</a>
                   </div>
                 </div>
               </a-form-model-item>
@@ -242,14 +242,8 @@ export default {
     }
   },
   methods: {
-    dowloadExcel (url) {
-      const elt = document.createElement('a')
-      elt.setAttribute('href', url)
-      elt.setAttribute('download', '')
-      elt.style.display = 'none'
-      document.body.appendChild(elt)
-      elt.click()
-      document.body.removeChild(elt)
+    openLink (url) {
+      window.open(url)
     },
     // 打印预览/快捷打印
     handlePrint (type) {

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.117/ocs-admin',
+        // target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,