QuKatie пре 3 година
родитељ
комит
6151dbc60c

+ 2 - 2
src/components/part-dialog/main.vue

@@ -120,10 +120,10 @@ export default {
       // });
     },
     priceChange(row) {
-      row.amout = _.multiply(
+      row.amout = Number(_.multiply(
         Number(row.goodNumber ? row.goodNumber : 0),
         Number(row.price ? row.price : 0)
-      );
+      )).toFixed(2);
     },
     rowDel(row, index) {
       this.$message({

+ 1 - 0
src/views/basicData/commodityType/detailsPageEdit.vue

@@ -477,6 +477,7 @@ export default {
           {
             label: "供应商",
             prop: "corpId",
+            span:12,
             rules: [
               {
                 required: true,

+ 1 - 1
src/views/basicData/productInformation/detailsPageEdit.vue

@@ -237,7 +237,7 @@ export default {
           {
             label: "供应商",
             prop: "corpId",
-            span: 8,
+             span:12,
             rules: [
               {
                 required: true,

+ 31 - 11
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -931,17 +931,15 @@ export default {
       this.data[index].partsPrice = sum;
       // 销售价=(配件采购价格+产品价格)/汇率 *(1+客户FOB系数/100)
       // this.data[index].price=_.multiply(multiplier, multiplicand)
-
-      this.data[index].price = Number(
+      this.data[index].productPrice = Number(
         _.multiply(
-          _.divide(
-            _.add(
-              Number(sum),
-              Number(
-                this.data[index].partsPrice ? this.data[index].partsPrice : 0
-              )
-            ),
-            Number(this.form.exchangeRate ? this.form.exchangeRate : 1)
+          _.add(
+            Number(sum),
+            Number(
+              this.data[index].purchaseAmount
+                ? this.data[index].purchaseAmount
+                : 0
+            )
           ),
           _.add(
             1,
@@ -952,11 +950,33 @@ export default {
           )
         )
       ).toFixed(2);
+      this.data[index].price = Number(
+        _.divide(
+          _.multiply(
+            _.add(
+              Number(sum),
+              Number(
+                this.data[index].purchaseAmount
+                  ? this.data[index].purchaseAmount
+                  : 0
+              )
+            ),
+            _.add(
+              1,
+              _.divide(
+                Number(this.form.coefficient ? this.form.coefficient : 0),
+                100
+              )
+            )
+          ),
+          Number(this.form.exchangeRate ? this.form.exchangeRate : 1)
+        )
+      ).toFixed(2);
       const names = [];
       const namePrices = [];
       rows.map(e => {
         names.push(e.goodName);
-        namePrices.push(e.goodName + ":" + e.price);
+        namePrices.push(e.goodName + ":" + e.amout);
       });
       this.data[index].partsDescribe = names.join(",");
       this.data[index].partsPriceDescribe = namePrices.join(";");