lilei hace 3 años
padre
commit
33820acd36

+ 1 - 1
src/config/router.config.js

@@ -1008,7 +1008,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'collectionPayment/:sn/:name',
+                path: 'collectionPayment/:sn/:name/:type',
                 name: 'companyReceivablePayableCollectionPayment',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/collectionPayment.vue'),
                 meta: {

+ 5 - 1
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -87,6 +87,10 @@ export default {
     settleClientSn: {
       type: String,
       default: ''
+    },
+    settleClientType: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -113,7 +117,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return settleInfoAllList(Object.assign(this.queryParam, { settleClientSn: this.settleClientSn, notEqZero: 1 })).then(res => {
+        return settleInfoAllList(Object.assign(this.queryParam, { settleClientType: this.settleClientType, settleClientSn: this.settleClientSn, notEqZero: 1 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 7 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -142,7 +142,13 @@
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
-    <choose-bill-modal :openModal="openModal" :nowChoose="chooseLoadData" :settleClientSn="$route.params.sn" @ok="handleOk" @close="handleClose" />
+    <choose-bill-modal
+      :openModal="openModal"
+      :nowChoose="chooseLoadData"
+      :settleClientType="$route.params.type"
+      :settleClientSn="$route.params.sn"
+      @ok="handleOk"
+      @close="handleClose" />
   </div>
 </template>
 

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -143,7 +143,7 @@ export default {
     },
     //  收付款
     handleCollectionPayment (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientName}` })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
     },
     //  重置
     resetSearchForm () {