PDA报工页面增加投料功能，扫描二维码取消获取产出记录列表，放开取消报工页面，编写取消报工逻辑，联调取消报工接口

yyb

5 天以前 0043a1a24cbed3ddd40c56c7931da9c5d14e4bc2

 pages/product/cancelReport/index.vue

@@ -2,48 +2,22 @@
  <!-- 取消报工 -->
  <view class="page">
    <view class="packing-registration-bg" />
    <u-navbar
      title="取消报工"
      :background="background"
      :border-bottom="false"
      :title-bold="true"
      title-color="#000"
      back-icon-color="#000"
    />
    <u-form
      :model="form"
      ref="uForm"
      :label-width="280"
      :rules="rules"
      :error-type="['toast']"
      class="uForm"
    >
      <u-navbar title="取消报工" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
         back-icon-color="#000" />
      <u-form :model="form" ref="uForm" :label-width="280" :rules="rules" :error-type="['toast']" class="uForm">
      <u-form-item label="订单号" :border-bottom="false" prop="moNo">
        <u-input
          v-model="form.moNo"
          type="select"
          placeholder="点击选择"
          @click="openList"
        />
            <u-input v-model="form.moNo" type="select" placeholder="点击选择" @click="openList" />
      </u-form-item>
      <u-form-item
        label="取消报工记录："
        :border-bottom="false"
        prop="value12"
      ></u-form-item>
         <u-form-item label="工单" :border-bottom="false" prop="optaskNo">
            <u-input v-model="form.optaskNo" type="select" placeholder="点击选择" @click="seachWork" />
         </u-form-item>
         <u-form-item label="取消报工记录：" :border-bottom="false" prop="value12"></u-form-item>
    </u-form>
    <view class="wrap">
      <scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true">
        <u-cell-group
          class="finishProductIn-locno-scroll-list-group"
          :border="false"
        >
          <view
            class="content"
            v-for="(item, index) in list"
            :key="item.moNo"
            :index="index"
          >
            <u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
               <view class="content" v-for="(item, index) in list" :key="item.moNo" :index="index"
                  @click="cancelReport(item,index)">
            <view class="content-header">
              <view class="content-header-title">{{ index + 1 }}</view>
            </view>
@@ -53,7 +27,7 @@
                  <view class="_label-name">批号：</view>
                </view>
                <view class="_content">
                  {{ item.moNo }}
                           {{ item.outBatchNo }}
                </view>
              </view>
              <view class="row-list">
@@ -85,15 +59,8 @@
        </u-cell-group>
      </scroll-view>
    </view>
    <u-modal
      width="720rpx"
      v-model="showModal"
      title=""
      :show-cancel-button="true"
      :show-confirm-button="true"
      @confirm="confirm"
      @cancel="cancel"
    >
      <u-modal width="720rpx" v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true"
         @confirm="confirmModle" @cancel="cancel">
      <view class="popup-content">
        <view class="packing-registration-param">
          <view class="packing-registration-param-view">
@@ -102,7 +69,7 @@
                <text class="item-one">批号</text>
              </view>
              <view class="packing-registration-param-item-right">
                <text class="item-one">{{ detailedList.moNo }}</text>
                        <text class="item-one">{{ detailedList.outBatchNo }}</text>
              </view>
            </view>
            <view class="packing-registration-param-item param-extra">
@@ -159,41 +126,47 @@
      },
      form: {
        moNo: "",
               optaskNo: "",
               id: "",
      },
      detailedList: {},
      list: [],
      rules: {},
      showModal: false,
        id: "",
    };
  },
  onReady() {},
  onShow() {
    let that = this;
    uni.$off("scan"); // 每次进来先 移除全局自定义事件监听器
    uni.$on("scan", function (data) {
      console.log("onscan");
      //扫码成功后的回调，你可以写自己的逻辑代码在这里
      console.log("页面扫码结果：", data.code);
      if (data.code) {
        let codeInfo = JSON.parse(data.code);
          console.log('222')
        if (codeInfo.moNo) {
          console.log('1111')
          // 扫描报工单二维码
          that.saveForm(codeInfo);
      // that.$forceUpdate();
        }
      }
    });
  },
      // onShow() {
      //   let that = this;
      //   uni.$off("scan"); // 每次进来先 移除全局自定义事件监听器
      //   uni.$on("scan", function (data) {
      //     console.log("onscan");
      //     //扫码成功后的回调，你可以写自己的逻辑代码在这里
      //     console.log("页面扫码结果：", data.code);
      //     if (data.code) {
      //       let codeInfo = JSON.parse(data.code);
      //         console.log('222')
      //       if (codeInfo.moNo) {
      //         console.log('1111')
      //         // 扫描报工单二维码
      //         that.saveForm(codeInfo);
      //    // that.$forceUpdate();
      //       }
      //     }
      //   });
      // },
  methods: {
    // 点击确认后获取取消报工记录
    confirm() {
      // 处理确认逻辑
      this.$u.api.cancelReporting.cancelDTAOfWorkApplication({outBatchNo:this.detailedList.outBatchNo}).then((res) => {
        console.log("res", res);
        this.list = res.data.records;
        this.showModal = false;
         //工单
         seachWork() {
            if (this.form.moNo == "") {
               this.$u.toast("请选择订单号");
               return;
            }
            // 使用uni.navigateTo方法跳转，并通过queryParams传递参数
            uni.navigateTo({
               url: "/pages/product/WorkshopOrderIssued/WorkOrderList?id=" +
                  encodeURIComponent(JSON.stringify(this.form.id)),
      });
    },
    cancel() {
@@ -206,6 +179,7 @@
    },
    setNo(val) {
      this.form.moNo = val.moNo;
            this.form.id = val.id;
    },
    // 回显扫码的信息-报工单
    saveForm(val) {
@@ -228,6 +202,56 @@
      }
      this.detailedList = val;
      this.showModal = true;
         },
         // 工单回显
         workNo(val) {
        this.id = val.id;
        this.getBGList();
            this.form.optaskNo = val.optaskNo;
      },
      getBGList() {
        this.$u.api.workReporting
            .getProductMainV1({
               current: 1,
               size: -1,
               id:this.id,
            })
          .then((res) => {
          console.log('res',res)
               this.list = res.data.productOutputList;
            });
      },
         // 取消报工
         cancelReport(item, index) {
            let that = this;
            uni.showModal({
               title: "提示",
               content: "是否确认取消批次" + item.outBatchNo + "的报工",
               success: function(res) {
                  if (res.confirm) {
                     that.detailedList = item;
                     that.showModal = true;
                  } else if (res.cancel) {
                     return;
                  }
               },
            });
         },
         confirmModle() {
            console.log("点击确认后获取取消报工记录");
            // 处理确认逻辑
            this.$u.api.cancelReporting
               .cancelDTAOfWorkApplication({
                  outBatchNo: this.detailedList.outBatchNo,
                  outputId: this.detailedList.id
               })
               .then((res) => {
                  console.log("res", res);
                  this.getBGList();
                  this.showModal = false;
                  // this.getHandelList();
                  this.$u.toast("取消报工成功");
               });
    },
  },
};
@@ -306,6 +330,7 @@
    }
  }
}

   .popup-content {
      width: 720rpx;
      height: 400rpx;
@@ -314,6 +339,7 @@
      z-index: 10;
      /* 确保内容在蒙版之上 */
   }

.page {
  box-sizing: border-box;
}
@@ -346,6 +372,7 @@
.u-form-item {
  padding: 0;
}

.wrap .finishProductIn-locno-scroll-list {
  height: calc(100vh - var(--window-top) - var(--window-bottom) - 242rpx);
  width: 100%;