Browse Source

Merge branch 'develop_yh10' of jianguan-web/jg-ocs-html into develop_yh11

李磊 2 years ago
parent
commit
21a053ade4

+ 18 - 18
src/views/financialManagement/financialCollection/baseModal.vue

@@ -36,7 +36,7 @@
           <dealerSubareaScopeList :disabled="!!bookSn" ref="settleClientName" @change="custChange" />
         </a-form-model-item>
         <a-form-model-item v-if="form.payerType=='DEPT'" label="付款方" prop="payerName">
-          <a-input :maxLength="30" placeholder="请输入付款方名称" v-model="form.payerName"></a-input>
+          <a-input :maxLength="30" :disabled="!!bookSn" placeholder="请输入付款方名称" v-model="form.payerName"></a-input>
         </a-form-model-item>
         <a-form-model-item label="备注">
           <a-textarea :rows="4" :maxLength="500" placeholder="请输入备注(最多500个字符)" v-model="form.remarks"></a-textarea>
@@ -75,7 +75,7 @@ export default {
   components: { VSelect, Upload, employee, dealerSubareaScopeList },
   props: {
     show: [Boolean],
-    itemSn: {
+    bookSn: {
       type: String,
       default: ''
     }
@@ -87,7 +87,6 @@ export default {
       disabled: false,
       title: '新增财务收款单',
       confirmLoading: false,
-      bookSn: this.itemSn,
       formItemLayout: {
         labelCol: { span: 4 },
         wrapperCol: { span: 18 }
@@ -178,6 +177,7 @@ export default {
     },
     //  详情
     getDetail () {
+      this.title = '编辑财务收款单'
       this.spinning = true
       this.confirmLoading = true
       financeBookFindBySn({ bookSn: this.bookSn }).then(res => {
@@ -214,20 +214,20 @@ export default {
         if (this.$refs.settleClientName) {
           this.$refs.settleClientName.resetForm()
         }
-        this.form = {
-          applyPersonSn: undefined,
-          bookReason: '',
-          payerType: 'DEALER',
-          dealerSn: undefined,
-          payerName: undefined,
-          remarks: '',
-          attachmentList: ''
-        }
-        if (this.bookSn) { //  编辑页
-          this.getDetail()
-          this.title = '编辑财务收款单'
-        }
       })
+      
+      this.form = {
+        applyPersonSn: undefined,
+        bookReason: '',
+        payerType: 'DEALER',
+        dealerSn: undefined,
+        payerName: undefined,
+        remarks: '',
+        attachmentList: ''
+      }
+      if (this.bookSn) { //  编辑页
+        this.getDetail()
+      }
     }
   },
   watch: {
@@ -237,8 +237,8 @@ export default {
         this.pageInit()
       }
     },
-    itemSn (a, b) {
-      this.bookSn = a
+    bookSn (a, b) {
+      console.log(a)
     }
   }
 }

+ 1 - 1
src/views/financialManagement/financialCollection/edit.vue

@@ -152,7 +152,7 @@
       ref="baseModal"
       @refashData="refashData"
       :show="openBaseModal"
-      :itemSn="$route.params.sn"
+      :bookSn="$route.params.sn"
       @cancel="openBaseModal=false"></baseModal>
     <!-- 明细弹框 -->
     <fcDetailModal

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

@@ -20,46 +20,46 @@
                   <div>
                     <table border="1" style="width: 564pt;border-collapse: collapse;text-align: center;">
                       <tr>
-                        <th style="line-height: 20pt;width: 56pt;background:#f6f6f6;">日期</th>
-                        <th style="line-height: 20pt;width: 62pt;background:#f6f6f6;">客户名称</th>
-                        <th style="line-height: 20pt;width: 62pt;background:#f6f6f6;">营业执照名称</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">订单金额</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">收款金额</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">使用授信</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">余款抵扣</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">汇入银行</th>
-                        <th style="line-height: 20pt;width: 54pt;background:#f6f6f6;">足额打款</th>
-                        <th style="line-height: 20pt;width: 60pt;background:#f6f6f6;">说明</th>
+                        <th style="width: 56pt;background:#f6f6f6;">日期</th>
+                        <th style="width: 62pt;background:#f6f6f6;">客户名称</th>
+                        <th style="width: 62pt;background:#f6f6f6;">营业执照名称</th>
+                        <th style="width: 54pt;background:#f6f6f6;">订单金额</th>
+                        <th style="width: 54pt;background:#f6f6f6;">收款金额</th>
+                        <th style="width: 54pt;background:#f6f6f6;">使用授信</th>
+                        <th style="width: 54pt;background:#f6f6f6;">余款抵扣</th>
+                        <th style="width: 54pt;background:#f6f6f6;">汇入银行</th>
+                        <th style="width: 54pt;background:#f6f6f6;">足额打款</th>
+                        <th style="width: 60pt;background:#f6f6f6;">说明</th>
                       </tr>
                       <tr v-for="item in fcItem.subList" :key="item.bookDetailSn">
-                        <td style="padding:3pt;width: 50pt;">{{ moment(item.receiptDate).format('YYYY/MM/DD') }}</td>
-                        <td style="padding:3pt;width: 56pt;text-align:left;">
+                        <td style="padding:3pt 1pt;width: 50pt;">{{ moment(item.receiptDate).format('YYYY/MM/DD') }}</td>
+                        <td style="padding:3pt 1pt;width: 56pt;text-align:left;">
                           {{ item.payerName }}
                           <div>
                             {{ item.dealerEntity ? item.dealerEntity.kdMidCustomerFnumber : '' }}
                           </div>
                         </td>
-                        <td style="padding:3pt;width: 56pt;text-align:left;">
+                        <td style="padding:3pt 1pt;width: 56pt;text-align:left;word-break:break-all;">
                           {{ item.payerAccountInfo }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
                           {{ item.orderAmount?item.orderAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
                           {{ item.receiptAmount?item.receiptAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
                           {{ getTotal(item.detailItemUseList||[]) }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
                           {{ item.balanceAmount?item.balanceAmount.toFixed(2):'0.00' }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;">
+                        <td style="padding:3pt 1pt;width: 48pt;">
                           {{ item.bankAccount }}<br>
                           {{ item.bankName }}
                         </td>
-                        <td style="padding:3pt;width: 48pt;">{{ item.fullPaymentFlagDictValue }}</td>
-                        <td style="padding:3pt;width: 54pt;word-break:break-all;">{{ item.explainInfo }}</td>
+                        <td style="padding:3pt 1pt;width: 48pt;">{{ item.fullPaymentFlagDictValue }}</td>
+                        <td style="padding:3pt 1pt;width: 54pt;word-break:break-all;">{{ item.explainInfo }}</td>
                       </tr>
                     </table>
                     <div style="padding:5pt 0;border-bottom: 1px solid #333;">使用授信明细:{{ fcItem.detail||'暂无。' }}</div>
@@ -124,6 +124,8 @@ export default {
       for (let i = 0; i < printCons.length; i++) {
         if (printCons[i].h > 560) {
           htmlStr.push('')
+        }else{
+          printCons[i].t = '<div style="width:564pt;margin:0 auto;height:535px;">' +printCons[i].t+'</div>'
         }
         htmlStr.push(printCons[i].t)
       }