소스 검색

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

lilei 2 년 전
부모
커밋
422f1be4d7

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

@@ -185,7 +185,7 @@ export default {
         { 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 : '--' } },
-        { title: '说明', dataIndex: 'remarks', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
+        { title: '说明', dataIndex: 'explainInfo', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       useCol: [

+ 3 - 3
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -174,7 +174,7 @@
           </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.remarks"></a-textarea>
+              <a-textarea :rows="2" :maxLength="500" placeholder="请输入说明(最多500个字符)" v-model="form.explainInfo"></a-textarea>
             </a-form-model-item>
           </a-col>
           <!-- 使用授信列表 -->
@@ -256,7 +256,7 @@ export default {
         bankAccount: undefined,
         bankName: undefined,
         fullPaymentFlag: '1',
-        remarks: ''
+        explainInfo: ''
       },
       rules: {
         receiptDate: [ { required: true, message: '请选择收款日期', trigger: ['change', 'blur'] } ],
@@ -464,7 +464,7 @@ export default {
         bankAccount: undefined,
         bankName: undefined,
         fullPaymentFlag: undefined,
-        remarks: ''
+        explainInfo: ''
       }
       this.$refs.ruleForm.resetFields()
     }

+ 21 - 3
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -51,7 +51,7 @@
             </a-descriptions-item>
             <a-descriptions-item label="收款类型">
               <span>{{ detail.keepTypeDictValue || '--' }}</span>
-              <span v-if="detail.keepTypeDictValue =='仅标记收款'"><a-button type="link"  class="link-bule">
+              <span v-if="detail.keepTypeDictValue =='仅标记收款'" @click="handleAssociated"><a-button type="link" :loading="associatedLoading" style="margin-left:10px;" class="link-bule">
                     关联收款单
               </a-button></span>
             </a-descriptions-item>
@@ -109,7 +109,7 @@ import { STable, VSelect } from '@/components'
 import commonModal from '@/views/common/commonModal.vue'
 import printModel from '../receiptPrint/printModel.vue'
 import detailModal from '@/views/financialManagement/financialCollection/detail.vue'
-import { settleReceiptFindBySn } from '@/api/settleReceipt.js'
+import { settleReceiptFindBySn,settleReceiptBookBatch } from '@/api/settleReceipt.js'
 export default {
   name: 'VoucherModal',
   components: { STable, VSelect, commonModal, printModel, detailModal },
@@ -152,7 +152,8 @@ export default {
         { title: '审核时间', dataIndex: 'auditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
-      tableData: []
+      tableData: [],
+      associatedLoading:false
     }
   },
   methods: {
@@ -193,6 +194,23 @@ export default {
       this.$emit('cancel')
       this.detail = null
       this.tableData = []
+    },
+    //关联收款单
+    handleAssociated(){
+      let snList,bookSnList=[];
+      snList.push(data.accountReceiptSn)
+      bookSnList.push(data.bookSn)
+      let ajax_data={
+        snList:snList,
+        bookSnList:bookSnList
+      }
+      this.associatedLoading = true
+      settleReceiptBookBatch(ajax_data).then(res => {
+        if (res.status == 200) {
+         this.handleCommonCancel();
+        }
+        this.associatedLoading = false
+      })
     }
   },
   watch: {