Browse Source

出入库修改

caojunjie 4 years ago
parent
commit
72b8383c47

+ 10 - 11
src/views/warehouseBusiness/inStock/index.vue

@@ -3331,12 +3331,12 @@ export default {
     this.getDicts("data_stltype_type").then(response => {
       this.fStltypeidOptions = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       console.log(response)
       this.warehouseOptions = response.data
@@ -4086,15 +4086,13 @@ export default {
           }
           // qty=(qty/1000).toFixed(2);
           let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
-
-
           if(this.key_id == 3){
             console.log("111")
             this.warehouseDrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
               fFeeid: feeId,
-              fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+              fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + "",
               fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
               fCurrency: 'RMB',
               fExrate: 1,
@@ -4106,11 +4104,12 @@ export default {
               fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
             })
           }else{
+            console.log(this.dialogWhgenlegList[zhgen].fFeeUnitid)
             this.warehouseCrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
               fFeeid: feeId,
-              fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+              fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + "",
               fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
               fCurrency: 'RMB',
               fExrate: 1,
@@ -4121,7 +4120,7 @@ export default {
               fMarks:this.form.fMarks,
               fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
             })
-
+            console.log(this.warehouseCrList)
           }
 
         }

+ 6 - 6
src/views/warehouseBusiness/outStock/index.vue

@@ -3032,12 +3032,12 @@ export default {
     this.getDicts("st_out_type").then((response) => {
       this.businessTypeOption = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })

+ 6 - 8
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2677,12 +2677,12 @@ export default {
     this.getDicts("st_trans_type").then((response) => {
       this.businessTypeOption = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })
@@ -3125,7 +3125,6 @@ export default {
             fProductName:this.form.fProductName,
             fMarks:this.form.fMarks,
             fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
-
           })
         } else {
           this.warehouseDrList.push({
@@ -3386,7 +3385,6 @@ export default {
       });
       let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
       listCorps(params).then((response) => {
-        console.log(response)
         this.fleetOptions = response.rows;
       });
       this.loading = true;