Ver código fonte

组件修改

lichao 3 anos atrás
pai
commit
7ed4b741b8

+ 7 - 2
src/components/fee-info/main.vue

@@ -323,7 +323,10 @@ export default {
     srcType: {
       type: Number,
       default: 2,
-    }
+    },
+    corpId: {
+      type: String
+    },
   },
   filters: {
     isPercentage(val) {
@@ -514,8 +517,10 @@ export default {
     },
     //新增
     rowAdd() {
+      if (!this.corpId) return this.$message.error('请选择往来单位')
       const params = {
-        feesType:this.selectTab
+        feesType:this.selectTab,
+        corpId: this.corpId
       }
       this.$refs.feeCrud.rowCellAdd(params);
     },

+ 32 - 17
src/components/finance/financialAccount.vue

@@ -110,6 +110,7 @@
   import {applyLoan, paymentApply} from "@/api/financialManagement/paymentRequest";
   import option from "./config/option.json"
   import {getUserInfo} from "@/api/system/user";
+
   export default {
     name: "financialAccount",
     props: {
@@ -126,6 +127,15 @@
         type: Array,
         default: []
       },
+      checkData: {
+        type: Object,
+        default: {
+          url: null,
+          pageStatus: null,
+          pageLabel: null,
+          checkType: null
+        },
+      },
     },
     data(){
       return {
@@ -255,11 +265,15 @@
         this.submitButton = true
         const itemsList = this.data.map(item => {
           item.corpId = this.corpId;
-          item.tradeType = this.billData.optionType
-          item.srcType = 1
+          item.tradeType = this.billData.optionType?this.billData.optionType: item.tradeType
+          // item.srcType = 1
           return item
         })
         const params = {
+          url: this.checkData.url,
+          pageStatus: this.checkData.pageStatus,
+          pageLabel: this.checkData.pageLabel,
+          checkType: this.checkData.checkType,
           billType : this.billType,
           DC : this.billData.itemType === "采购"?"C":"D",     //账单明细会根据D C区分采购 销售搜索
           itemsList: itemsList
@@ -271,21 +285,22 @@
               this.$message.success("操作成功!")
               this.$emit("choceFun");
               //跳转付款申请页面
-              if(this.$store.getters.pqStatus){
-                this.$alert("无法自动跳,因为付费申请页面已存在!", "温馨提示", {
-                  confirmButtonText: "确定",
-                  type: 'warning',
-                  callback: action => {
-                  }
-                });
-              }else{
-                //关闭一下存在的列表页  跳转
-                this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
-                this.$router.push({
-                  path: "/financialManagement/paymentRequest/index",
-                  query: {params: res.data.data.id},
-                });
-              }
+
+              // if(this.$store.getters.pqStatus){
+              //   this.$alert("无法自动跳,因为付费申请页面已存在!", "温馨提示", {
+              //     confirmButtonText: "确定",
+              //     type: 'warning',
+              //     callback: action => {
+              //     }
+              //   });
+              // }else{
+              //   //关闭一下存在的列表页  跳转
+              //   this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
+              //   this.$router.push({
+              //     path: "/financialManagement/paymentRequest/index",
+              //     query: {params: res.data.data.id},
+              //   });
+              // }
             }
           }).finally(()=>{
             this.submitButton = false