Browse Source

仓储模块计价单位回显

wengyuwen 4 years ago
parent
commit
3540d27332

+ 46 - 36
src/views/warehouseBusiness/inStock/index.vue

@@ -3823,44 +3823,54 @@ export default {
     },
     // 收款信息
     addCollection() {
-      this.warehouseDrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid:'',
-        fQty: null,
-        fUnitprice: null,
-        fAmount: null,
-        fCurrency: "RMB",
-        fExrate: "1",
-        fTaxrate: this.fTaxrate,
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType:this.form.fBusinessType
-      });
+      if(this.form.fBusinessType == null){
+        this.$message.error("请维护作业类型")
+        return false
+      }else{
+        this.warehouseDrList.push({
+          fCorpid: null,
+          fFeeid: null,
+          fFeeUnitid:this.form.fFeetunit,
+          fQty: null,
+          fUnitprice: null,
+          fAmount: null,
+          fCurrency: "RMB",
+          fExrate: "1",
+          fTaxrate: this.fTaxrate,
+          fCxrate: null,
+          fRate: null,
+          remarks: null,
+          fMblno:this.form.fMblno,
+          fProductName:this.form.fProductName,
+          fMarks:this.form.fMarks,
+          fBusinessType:this.form.fBusinessType
+        });
+      }
     },
     addpayment() {
-      this.warehouseCrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid:'',
-        fQty: null,
-        fUnitprice: null,
-        fAmount: null,
-        fCurrency: "RMB",
-        fExrate: "1",
-        fTaxrate: this.fTaxrate,
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType:this.form.fBusinessType
-      });
+      if(this.form.fBusinessType == null){
+        this.$message.error("请维护作业类型")
+        return false
+      }else {
+        this.warehouseCrList.push({
+          fCorpid: null,
+          fFeeid: null,
+          fFeeUnitid: this.form.fFeetunit,
+          fQty: null,
+          fUnitprice: null,
+          fAmount: null,
+          fCurrency: "RMB",
+          fExrate: "1",
+          fTaxrate: this.fTaxrate,
+          fCxrate: null,
+          fRate: null,
+          remarks: null,
+          fMblno: this.form.fMblno,
+          fProductName: this.form.fProductName,
+          fMarks: this.form.fMarks,
+          fBusinessType: this.form.fBusinessType
+        });
+      }
     },
     queryUser() {
       queryUserVal().then((response) => {

+ 45 - 32
src/views/warehouseBusiness/outStock/index.vue

@@ -3909,40 +3909,53 @@ export default {
     },
     // 收款信息
     addCollection() {
-      this.warehouseDrList.push({
-        fcorpid: this.form.fCorpid,
-        ffeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        funitprice: 0,
-        fAmount: 0,
-        fCurrency: "RMB",
-        fExrate: 1,
-        fTaxrate: this.fTaxrate,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType: this.form.fBusinessType + ''
-      });
+      console.log(this.form.fBusinessType)
+      if(this.form.fBusinessType == null){
+        console.log("111")
+        this.$message.error("请维护作业类型")
+        return false
+      }else {
+        console.log("222")
+        this.warehouseDrList.push({
+          fcorpid: this.form.fCorpid,
+          ffeeid: null,
+          fFeeunitid: this.form.fFeetunit,
+          fQty: 0,
+          funitprice: 0,
+          fAmount: 0,
+          fCurrency: "RMB",
+          fExrate: 1,
+          fTaxrate: this.fTaxrate,
+          remarks: null,
+          fMblno: this.form.fMblno,
+          fProductName: this.form.fProductName,
+          fMarks: this.form.fMarks,
+          fBusinessType: this.form.fBusinessType
+        });
+      }
     },
     addpayment() {
-      this.warehouseCrList.push({
-        fcorpid: this.form.fCorpid,
-        ffeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        funitprice: 0,
-        fAmount: 0,
-        fCurrency: "RMB",
-        fExrate: 1,
-        fTaxrate: this.fTaxrate,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType:this.form.fBusinessType + ''
-      });
+      if(this.form.fBusinessType == null){
+        this.$message.error("请维护作业类型")
+        return false
+      }else {
+        this.warehouseCrList.push({
+          fcorpid: this.form.fCorpid,
+          ffeeid: null,
+          fFeeunitid: this.form.fFeetunit,
+          fQty: 0,
+          funitprice: 0,
+          fAmount: 0,
+          fCurrency: "RMB",
+          fExrate: 1,
+          fTaxrate: this.fTaxrate,
+          remarks: null,
+          fMblno: this.form.fMblno,
+          fProductName: this.form.fProductName,
+          fMarks: this.form.fMarks,
+          fBusinessType: this.form.fBusinessType
+        });
+      }
     },
     queryUser() {
       queryUserVal().then((response) => {

+ 42 - 32
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -3335,40 +3335,50 @@ export default {
     },
     // 收款信息
     addCollection() {
-      this.warehouseDrList.push({
-        fcorpid: this.form.fCorpid,
-        ffeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        funitprice: 0,
-        fAmount: 0,
-        fCurrency: "RMB",
-        fExrate: 1,
-        fTaxrate: this.fTaxrate,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType: this.form.fBusinessType
-      });
+      if(this.form.fBusinessType == null){
+        this.$message.error("请维护作业类型")
+        return false
+      }else{
+        this.warehouseDrList.push({
+          fcorpid: this.form.fCorpid,
+          ffeeid: null,
+          fFeeunitid: '2',
+          fQty: 0,
+          funitprice: 0,
+          fAmount: 0,
+          fCurrency: "RMB",
+          fExrate: 1,
+          fTaxrate: this.fTaxrate,
+          remarks: null,
+          fMblno:this.form.fMblno,
+          fProductName:this.form.fProductName,
+          fMarks:this.form.fMarks,
+          fBusinessType: this.form.fBusinessType
+        });
+      }
     },
     addpayment() {
-      this.warehouseCrList.push({
-        fcorpid: this.form.fCorpid,
-        ffeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        funitprice: 0,
-        fAmount: 0,
-        fCurrency: "RMB",
-        fExrate: 1,
-        fTaxrate: this.fTaxrate,
-        remarks: null,
-        fMblno:this.form.fMblno,
-        fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks,
-        fBusinessType:this.form.fBusinessType
-      });
+      if(this.form.fBusinessType == null){
+        this.$message.error("请维护作业类型")
+        return false
+      }else {
+        this.warehouseCrList.push({
+          fcorpid: this.form.fCorpid,
+          ffeeid: null,
+          fFeeunitid: '2',
+          fQty: 0,
+          funitprice: 0,
+          fAmount: 0,
+          fCurrency: "RMB",
+          fExrate: 1,
+          fTaxrate: this.fTaxrate,
+          remarks: null,
+          fMblno: this.form.fMblno,
+          fProductName: this.form.fProductName,
+          fMarks: this.form.fMarks,
+          fBusinessType: this.form.fBusinessType
+        });
+      }
     },
     queryUser() {
       queryUserVal().then((response) => {