ccjgmwz 3 سال پیش
والد
کامیت
9d5008ef44

+ 1 - 1
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1142,7 +1142,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.warehousingFee) {
+      if (this.deptBudgetList.warehousingFee == undefined || this.deptBudgetList.warehousingFee == null) {
         this.$message({
           message: '请输入入库费!',
           type: 'warning',

+ 15 - 15
src/views/purchasingManagement/purchaseOrderList.vue

@@ -1195,21 +1195,21 @@ export default {
         })
         return
       }
-      if (
-        (this.closePositionList1.closingBasis &&
-          String(this.closePositionList1.closingBasis).indexOf('.') != -1 &&
-          String(this.closePositionList1.closingBasis).length -
-            (String(this.closePositionList1.closingBasis).indexOf('.') + 1) >
-            2) ||
-        this.closePositionList1.closingBasis > 10000 ||
-        this.closePositionList1.closingBasis < 1
-      ) {
-        this.$message({
-          message: '平仓基差输入错误',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   (this.closePositionList1.closingBasis &&
+      //     String(this.closePositionList1.closingBasis).indexOf('.') != -1 &&
+      //     String(this.closePositionList1.closingBasis).length -
+      //       (String(this.closePositionList1.closingBasis).indexOf('.') + 1) >
+      //       2) ||
+      //   this.closePositionList1.closingBasis > 10000 ||
+      //   this.closePositionList1.closingBasis < 1
+      // ) {
+      //   this.$message({
+      //     message: '平仓基差输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (!this.closePositionList1.closePositionDate) {
         this.$message({
           message: '平仓日期不能为空!',

+ 4 - 4
src/views/salesManagement/salesPlanOrderList.vue

@@ -1652,10 +1652,10 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].basischange = false
-            response.records[i].openPosition =
-              response.records[i].cumulativeTurnover -
-              response.records[i].closedPosition -
-              response.records[i].stockOutQuantity
+            // response.records[i].openPosition =
+            //   response.records[i].cumulativeTurnover -
+            //   response.records[i].closedPosition -
+            //   response.records[i].stockOutQuantity
           }
           this.warehouseList = response
           this.deptCircularPage.currentPage = response.current

+ 11 - 11
src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -551,17 +551,17 @@ export default {
       })
         .toPromise()
         .then(response => {
-          for (var i = 0; i < response.records.length; i++) {
-            if((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity>0){
-              response.records[i].amountIngPayable=(response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity
-            }
-            else{
-              response.records[i].collectionIngPayable=response.records[i].collectionIngPayable+Math.abs((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity)
-              response.records[i].amountIngPayable=0
-              response.records[i].amountEdPayable=0
-              response.records[i].amountNotPayable=0
-            }
-          }
+          // for (var i = 0; i < response.records.length; i++) {
+          //   if((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity>0){
+          //     response.records[i].amountIngPayable=(response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity
+          //   }
+          //   else{
+          //     response.records[i].collectionIngPayable=response.records[i].collectionIngPayable+Math.abs((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity)
+          //     response.records[i].amountIngPayable=0
+          //     response.records[i].amountEdPayable=0
+          //     response.records[i].amountNotPayable=0
+          //   }
+          // }
           this.warehouseList = response
           this.deptBudgetTotal=response.total
         })