1

src/views/orderEntry/orderEnter/index.vue

@@ -240,7 +240,8 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((item) => item == '006') && (scope.row.status === '2'||scope.row.status === '4')
+              powers.some((item) => item == '006') &&
+              (scope.row.status === '2' || scope.row.status === '4')
             "
             effect="dark"
             content="删除"
@@ -504,12 +505,11 @@ export default {
       let isok = true,
         ids = [];
       this.changeList.forEach((item) => {
-        if (item.status != "2") {
-          isok = false;
-        } else if (item.status != "4") {
-          isok = false;
-        } else {
+        console.log(item);
+        if (item.status === "2" || item.status === "4") {
           ids.push(item.id);
+        } else {
+          isok = false;
         }
       });
       if (!isok) {

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -866,15 +866,19 @@ export default {
       let e = this.accAdd(pakge_fee, mark_fee); //包装费+加标费
       let f = this.accAdd(cert_fee, nake_fee); //证书费+产品裸价
       if (this.is_noble) {
-        this.newPrice = this.accAdd(
-          this.accAdd(this.accAdd(a, b), this.accAdd(c, d)),
-          this.accAdd(this.accAdd(e, f), delivery_fee)
-        );
+        this.newPrice = (
+          this.accAdd(
+            this.accAdd(this.accAdd(a, b), this.accAdd(c, d)),
+            this.accAdd(this.accAdd(e, f), delivery_fee)
+          ) + ""
+        ).toFixed(2);
       } else {
-        this.newPrice = this.accAdd(
-          this.accAdd(this.accAdd(a, b), this.accAdd(e, f)),
-          delivery_fee
-        );
+        this.newPrice = (
+          this.accAdd(
+            this.accAdd(this.accAdd(a, b), this.accAdd(e, f)),
+            delivery_fee
+          ) + ""
+        ).toFixed(2);
       }
       console.log(new Date().valueOf() + this.newPrice);
     },
@@ -1003,7 +1007,7 @@ export default {
       if (this.is_noble) {
         this.ruleForm.nake_fee = "0";
       }
-       this.computedCost();
+      this.computedCost();
       if (this.ruleForm.good_img.length > 10) {
         this.$message.warning("上传图片不能超过10张");
         return;