lilei 10 месяцев назад
Родитель
Сommit
01e512aca9

+ 7 - 5
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -165,6 +165,7 @@
           授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
           余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
           跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
+          特殊申请发货总金额:<strong>{{ toThousands(countData&&countData.specialSendAmount||0) }}</strong>;
         </div>
       </div>
       <a-spin :spinning="spinning" tip="Loading...">
@@ -354,6 +355,7 @@ export default {
         { title: '授信还款', dataIndex: 'payCreditAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '特殊申请发货', dataIndex: 'specialSendAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
@@ -407,7 +409,7 @@ export default {
               dataList.map(item => {
                 data.push({ id: item.id, printStatus: 'NO_PRINT' })
               })
-              _this.plUpdateStatus(data,1)
+              _this.plUpdateStatus(data, 1)
             }
           })
         } else {
@@ -418,16 +420,16 @@ export default {
       if (e.key == 2) { // 批量开票
         const data = []
         rows.map(item => {
-          data.push({ id: item.id, invoiceDate: '', remarks: ''})
+          data.push({ id: item.id, invoiceDate: '', remarks: '' })
         })
         _this.plinvoiceInfo = data
         _this.plinvoiceIsShow = true
       }
     },
     // 批量操作
-    plUpdateStatus (data,type) {
+    plUpdateStatus (data, type) {
       this.spinning = true
-      financeBookDetailUpdateBatch(data,type).then(res => {
+      financeBookDetailUpdateBatch(data, type).then(res => {
         if (res.status == 200) {
           this.searchForm()
         }
@@ -440,7 +442,7 @@ export default {
         item.invoiceDate = data.invoiceDate
         item.remarks = data.remarks
       })
-      this.plUpdateStatus(this.plinvoiceInfo,0)
+      this.plUpdateStatus(this.plinvoiceInfo, 0)
     },
     // 表格选中项
     rowSelectionFun (obj) {

+ 3 - 0
src/views/financialManagement/financialCollection/edit.vue

@@ -58,6 +58,8 @@
             使用授信合计 {{ toThousands(detailData.useTotalAmount||0) }},
             授信还款合计 {{ toThousands(detailData.payTotalAmount||0) }},
             余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }}
+            跨月打款合计 {{ toThousands(detailData.nextMonthTotalAmount||0) }},
+            特殊申请发货合计 {{ toThousands(detailData.specialTotalAmount||0) }}
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -256,6 +258,7 @@ export default {
         { title: '授信还款', dataIndex: 'payTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '特殊申请发货', dataIndex: 'specialSendAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },

+ 35 - 21
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -39,7 +39,7 @@
           <a-col :span="12">
             <a-form-model-item style="margin-bottom:5px;" label="付款方" prop="dealerSn">
               <!-- <dealerSubareaScopeList ref="settleClientName" @change="custChange" :disabled="true" /> -->
-              {{form.payerName}}
+              {{ form.payerName }}
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -78,7 +78,7 @@
           <a-col :span="12">
             <a-form-model-item style="margin-bottom:5px;" label="付款方" prop="payerName">
               <!-- <a-input :maxLength="30" placeholder="请输入付款方名称" disabled v-model="form.payerName"></a-input> -->
-              {{form.payerName}}
+              {{ form.payerName }}
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -135,7 +135,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item style="margin-bottom:5px;" label="跨月打款">
+            <a-form-model-item style="margin-bottom:5px;">
               <a-input-number
                 style="width:100%"
                 :min="0"
@@ -145,6 +145,27 @@
                 v-model="form.nextMonthAmount"></a-input-number>
             </a-form-model-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-model-item style="margin-bottom:5px;">
+              <a-input-number
+                style="width:100%"
+                :min="0"
+                :max="99999999"
+                :precision="2"
+                placeholder="请输入特殊申请发货金额"
+                v-model="form.specialSendAmount"></a-input-number>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item style="margin-bottom:5px;">
+              <v-select
+                showType="radio"
+                v-model="form.fullPaymentFlag"
+                code="FLAG"
+                placeholder="请选择是否足额打款"
+                allowClear></v-select>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="12">
             <a-form-model-item style="margin-bottom:5px;" label="户名" prop="bankAccount">
               <a-select placeholder="请选择户名" v-model="form.bankAccount" style="width: 100%" @change="handleChange">
@@ -163,15 +184,6 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-model-item style="margin-bottom:5px;" label="足额打款">
-              <v-select
-                v-model="form.fullPaymentFlag"
-                code="FLAG"
-                placeholder="请选择是否足额打款"
-                allowClear></v-select>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item style="margin-bottom:5px;" label="说明" :labelCol="{span:3}" :wrapper-col="{ span: 20 }">
               <a-textarea :rows="2" :maxLength="500" placeholder="请输入说明(最多500个字符)" v-model="form.explainInfo"></a-textarea>
@@ -254,6 +266,7 @@ export default {
         detailItemPayList: [],
         balanceAmount: '',
         nextMonthAmount: '',
+        specialSendAmount: '',
         bankAccount: '东莞箭冠',
         bankName: '东莞银行',
         fullPaymentFlag: '1',
@@ -265,8 +278,8 @@ export default {
         dealerSn: [ { required: true, message: '请选择付款方', trigger: ['change', 'blur'] } ],
         payerName: [ { required: true, message: '请输入付款方名称', trigger: ['change', 'blur'] } ],
         payerAccountType: [ { required: true, message: '请选择付款账户类型', trigger: ['change', 'blur'] } ],
-        bankAccount:[{ required: true, message: '请选择户名', trigger: ['change', 'blur'] }],
-        bankName:[{ required: true, message: '请选择汇入银行', trigger: ['change', 'blur'] }]
+        bankAccount: [{ required: true, message: '请选择户名', trigger: ['change', 'blur'] }],
+        bankName: [{ required: true, message: '请选择汇入银行', trigger: ['change', 'blur'] }]
       },
       useTotalAmount: '',
       payTotalAmount: '',
@@ -315,11 +328,11 @@ export default {
         this.form.licenseName = ''
         this.form.payerAccountInfo = ''
       }
-      if(this.form.payerAccountType=='PUBLIC'){
+      if (this.form.payerAccountType == 'PUBLIC') {
         this.form.bankAccount = '东莞箭冠'
         this.form.bankName = '东莞银行'
         this.bankNameList = ['东莞银行']
-      }else{
+      } else {
         this.form.bankAccount = '张丽添'
         this.form.bankName = '农业银行'
         this.bankNameList = ['农业银行']
@@ -327,11 +340,11 @@ export default {
     },
     handleChange (v) {
       console.log(v)
-      if(v){
+      if (v) {
         this.form.bankAccount = v
         const row = this.bankList.find(item => item.bankAccount == v)
         this.bankNameList = row.bankName
-        this.form.bankName = undefined  
+        this.form.bankName = undefined
       }
     },
     getLastPayerAccount () {
@@ -430,10 +443,10 @@ export default {
     setDetail (data) {
       this.form = Object.assign(this.form, { payerTypeDictValue: data.payerTypeDictValue, payerType: data.payerType, dealerSn: data.dealerSn, payerName: data.payerName })
       this.$nextTick(() => {
-        if(this.form.dealerSn){
+        if (this.form.dealerSn) {
           // this.$refs.settleClientName.getDetail(this.form.dealerSn)
           this.getDealerDetail(this.form.dealerSn)
-        }else{
+        } else {
           this.form.bankAccount = '张丽添'
           this.form.bankName = '农业银行'
           this.bankNameList = ['农业银行']
@@ -476,7 +489,7 @@ export default {
       })
       this.bankNameList = []
       this.bankNameList = ['东莞银行']
-      if(this.$refs.ruleForm){
+      if (this.$refs.ruleForm) {
         this.$refs.ruleForm.resetFields()
       }
       this.form = {
@@ -496,6 +509,7 @@ export default {
         detailItemPayList: [],
         balanceAmount: '',
         nextMonthAmount: '',
+        specialSendAmount: '',
         bankAccount: '东莞箭冠',
         bankName: '东莞银行',
         fullPaymentFlag: '1',

+ 4 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -92,6 +92,8 @@
               使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
               授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
               余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
+              跨月打款总金额:{{ toThousands(countData&&countData.nextMonthTotalAmount||0) }};
+              特殊申请发货总金额:{{ toThousands(countData&&countData.specialTotalAmount||0) }};
             </div>
           </div>
           <div></div>
@@ -251,6 +253,8 @@ export default {
         { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '跨月打款总金额', dataIndex: 'nextMonthAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '特殊申请发货总金额', dataIndex: 'specialSendAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }

+ 2 - 0
src/views/salesManagement/receiptPrint/list.vue

@@ -231,6 +231,8 @@ export default {
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '使用授信', dataIndex: 'useCreditAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣', dataIndex: 'balanceAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '跨月打款', dataIndex: 'nextMonthAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '特殊申请发货', dataIndex: 'specialSendAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/salesManagement/receiptPrint/printModel.vue

@@ -26,7 +26,7 @@
                         <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: 53pt;background:#f6f6f6;">汇入银行</th>
                         <th style="width: 37pt;background:#f6f6f6;">足额<br>打款</th>
                         <th style="width: 64pt;background:#f6f6f6;">说明</th>