Browse Source

Merge branch 'develop_bug0402' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh03

bug 修复
lilei 3 năm trước cách đây
mục cha
commit
5524954448

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

@@ -1070,7 +1070,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: {
@@ -1081,7 +1081,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'detail/:sn/:name',
+                path: 'detail/:sn/:name/:type',
                 name: 'companyReceivablePayableDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.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 () {
@@ -114,7 +118,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

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

@@ -165,6 +165,7 @@
       ref="chooseBillModal"
       :openModal="openModal"
       :nowChoose="chooseLoadData"
+      :settleClientType="$route.params.type"
       :settleClientSn="$route.params.sn"
       @ok="handleOk"
       @close="handleClose" />

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

@@ -105,7 +105,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam, { settleClientSn: this.$route.params.sn })
+        const params = Object.assign(parameter, this.queryParam, { settleClientSn: this.$route.params.sn, settleClientType: this.$route.params.type })
         return settleInfoList(params).then(res => {
           let data
           if (res.status == 200) {

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

@@ -129,7 +129,7 @@ export default {
   methods: {
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientName}` })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
     },
     // 合计
     getTotal (param) {
@@ -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 () {