字符串转换回数字进行比较，toFixed()方法返回字符串类型

yyb

14 小时以前 39a59f4b31181904497ecc1db26d1f0183b81d77

 pages/wareHouse/nuclearScale/index.vue

@@ -130,7 +130,9 @@
            @click="cancelReport(item)"
          >
            <view class="content-header">
              <view class="content-header-title">{{ index + 1 }}</view>
              <view class="content-header-title">{{
                ScanCodeRecord.length - index
              }}</view>
            </view>
            <view class="content-body">
              <view class="row-list">
@@ -170,7 +172,7 @@
                  <view class="_label-name">盘重：</view>
                </view>
                <view class="_content">
                  {{ item.trayWeight }}
                  {{ item.tareWeight }}
                </view>
              </view>
              <view class="row-list">
@@ -204,6 +206,7 @@
              </view>
              <view class="packing-registration-param-item-right">
                <u-input
                  type="number"
                  class="item-one item-two"
                  v-model="modalList.verificationWeight"
                />
@@ -215,6 +218,7 @@
              </view>
              <view class="packing-registration-param-item-right">
                <u-input
                  type="number"
                  class="item-one item-two"
                  v-model="modalList.forkliftWeight"
                />
@@ -258,9 +262,9 @@
      modalList: {},
      showModal: false,
      productTypeMap: {
        1: "导体",
        2: "铜杆",
        3: "导体2.6",
        DTO1: "导体",
        TG01: "铜杆",
        DT02: "导体2.6",
      },
      ScanCodeRecord: [],
      background: {
@@ -302,11 +306,13 @@
      console.log("页面扫码结果：", data.code);
      if (data.code) {
        let codeInfo = JSON.parse(data.code);
        

        // 添加重复扫码检查
        const batchNo = codeInfo.BN;
        const isDuplicate = that.ScanCodeRecord.some(item => item.outBatchNo === batchNo);
        
        const isDuplicate = that.ScanCodeRecord.some(
          (item) => item.outBatchNo === batchNo
        );

        if (isDuplicate) {
          uni.showToast({
            icon: "none",
@@ -315,7 +321,7 @@
          });
          return;
        }
        

        let ScanCodeRecordList = {
          outBatchNo: codeInfo.BN,
          netWeight: codeInfo.NW,
@@ -328,32 +334,38 @@
          waivDevRejNo: codeInfo.WDR ? codeInfo.WDR : "*", // wdr号
          productType: that.form.productType,
        };
        if (codeInfo.CN != that.form.customerName1) {
          // 扫描报工单二维码
          uni.showModal({
            title: "提示",
            content:
              "客户不一致：" + codeInfo.CN + "||" + that.form.customerName1,
            showCancel: true,
            success: function () {
              if (that.form.productType == "TG01") {
                that.$refs.saveForm.open(ScanCodeRecordList);
              } else {
                that.ScanCodeRecord.push(ScanCodeRecordList);
              }
            },
          });
        if (that.form.productType == "TG01") {
          that.$refs.saveForm.open(ScanCodeRecordList);
        } else {
          if (that.form.productType == "TG01") {
            that.$refs.saveForm.open(ScanCodeRecordList);
          } else {
            that.ScanCodeRecord.push(ScanCodeRecordList);
          }
          that.queryCustomName(codeInfo, ScanCodeRecordList);
        }
      }
    });
  },
  methods: {
    queryCustomName(codeInfo, ScanCodeRecordList) {
      // 查询客户名称
      this.$u.api.NuclearScaleEntry.queryCustomName({
        BN: codeInfo.BN,
      }).then((res) => {
        console.log("客户名称：", res);
        if (res.data != this.form.customerName1) {
          let that = this;
          // 扫描报工单二维码
          uni.showModal({
            title: "提示",
            content:
              "客户不一致：" + res.data + " || " + that.form.customerName1,
            showCancel: true,
            success: function (res) {
              that.ScanCodeRecord.unshift(ScanCodeRecordList);
            },
          });
        } else {
          this.ScanCodeRecord.unshift(ScanCodeRecordList);
        }
      });
    },
    // 取消扫码记录
    cancelReport(item) {
      let that = this;
@@ -382,31 +394,39 @@
        });
      }
      // 使用正确的字段名suppliedQuantity，而不是voltage
      const magnetic =
      const magnetic =(
        Number(this.modalList.verificationWeight) -
        Number(this.modalList.forkliftWeight) -
        grossWeightSum;
        grossWeightSum).toFixed(1);
      this.form.verificationWeight = this.modalList.verificationWeight;
      this.form.forkliftWeight = this.modalList.forkliftWeight;
      switch (this.form.productType) {
        case "DT01":
          if (magnetic >= 0 && magnetic <= 3) {
            this.allSubmit();
          if (Number(magnetic) >= -3 && Number(magnetic) <= 3) {
            let that = this;
            uni.showModal({
              title: "提示",
              content: "磅差:" + magnetic + "，是否确认提交？",
              success: function (res) {
                  that.allSubmit();
              },
            });
          } else {
            this.$u.toast("生产核查");
            this.$u.toast("磅差:" + magnetic + "，请车间核查");
          }
          break;
        case "DT02":
          if (magnetic >= -0.5 && magnetic <= 0.5) {
          if (Number(magnetic) >= -0.5 && Number(magnetic) <= 0.5) {
            // this.ScanCodeRecord.push(this.form);
            this.allSubmit();
          } else {
            this.$u.toast("生产核查");
            this.$u.toast("磅差:" + magnetic + "，请车间核查");
          }
          break;
      }
    },
    allSubmit() {
      console.log("进来了", this.ScanCodeRecord);
      this.ScanCodeRecord.forEach((item) => {
        item.batchNo = item.outBatchNo;
      });
@@ -422,14 +442,20 @@
        .then((res) => {
          this.$u.toast("提交成功");
          this.ScanCodeRecord = [];
          // if (this.form.productTypeMap == "DT01") {
          this.modalList = {
            verificationWeight: "",
            // };
          };
        })
        .catch((err) => {
          uni.hideLoading();
          uni.showToast({
            title: err.message || "网络异常，请重试",
            icon: "none",
          uni.showModal({
            title: "提示",
            content: err.message || "网络异常，请重试",
            showCancel: true,
            success: function (res) {},
          });
          // this.$u.toast(err.message || "网络异常，请重试");
        });
    },

@@ -451,13 +477,19 @@
      this.$u.api.NuclearScaleEntry.createDetail(this.form)
        .then((res) => {
          this.$u.toast("提交成功");
          this.ScanCodeRecord.push(Obj);
          this.ScanCodeRecord = [];
          // this.ScanCodeRecord.unshift(Obj);
          this.$refs.saveForm.cancel();
        })
        .catch(() => {
          uni.hideLoading();
          this.$refs.saveForm.cancel();
          this.$u.toast("网络异常，请重试");
          uni.showModal({
            title: "提示",
            content: err.message || "网络异常，请重试",
            showCancel: true,
            success: function (res) {},
          });
        });
    },
    // 提交按钮
@@ -482,7 +514,7 @@
    },
    //核磅记录
    openNuclearScaleRecord() {
      if (this.form.verificationNo == "") {
      if (!this.form.verificationNo) {
        uni.showToast({
          icon: "none",
          title: "请先选择核磅单号！",
@@ -491,7 +523,9 @@
        return;
      }
      uni.navigateTo({
        url: "/pages/wareHouse/nuclearScale/nuclearscalerecord",
        url:
          "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
          encodeURIComponent(JSON.stringify(this.form.verificationNo)),
      });
    },
    // 存订单号