yyb
3 天以前 1f017a1ebe252ef945e42dc868ac8c24e2b6d534
pda报工选择投料接口变更
已修改3个文件
106 ■■■■ 文件已修改
common/http.api.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/product/report/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/product/report/seachPersonnelNo.vue 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/http.api.js
@@ -509,6 +509,7 @@
            cancelDTAOfWorkApplication: (params = {}) => vm.$u.get('/mes/product/cancelDTAOfWorkApplication', params),
            selInputPartInfoPDA: (params = {}) => vm.$u.get('/mes/stock/selInputPartInfoPDA', params),
            fuzzyQuery: (params = {}) => vm.$u.get('mes/applyPart/fuzzyQuery', params),
            getStockNoPageByWorkstationId: (params = {}) => vm.$u.get('/mes/stock/getStockNoPageByWorkstationId', params),
        },
        // 车间订单下发
        WorkshopOrderIssued: {
pages/product/report/index.vue
@@ -235,7 +235,7 @@
                },
                reportProductionVolumelist: {},
                FeedInputProductionVolumeList: {}, //投料产量
                FeedInputProductionVolumeList: [], //投料产量
                personList: [],
                canSelectPerson: false,
                rules: {
@@ -328,7 +328,7 @@
                            this.$u.toast("提交成功");
                            this.InventoryReceiptList.unshift(this.form.productOutputList[0]);
                            this.reportProductionVolumelist = {},
                            this.FeedInputProductionVolumeList = {}, //投料产量
                            this.FeedInputProductionVolumeList = [], //投料产量
                            this.form.FeedInputProductionVolume = null, //投料产量
                            this.form.reportProductionVolume = null, //汇报产量
                            console.log("this.InventoryReceiptList", this.InventoryReceiptList);
@@ -397,7 +397,8 @@
                    return;
                }
                uni.navigateTo({
                    url: "/pages/product/report/seachPersonnelNo?moOn=" + this.form.moOn,
                    url: "/pages/product/report/seachPersonnelNo?moOn=" + this.form.moOn + "&workstationId=" + this.form.workstationId,
                });
            },
pages/product/report/seachPersonnelNo.vue
@@ -10,11 +10,11 @@
            <!-- 模糊查询推荐列表 -->
            <view v-if="recommendations.length > 0" class="recommendation-list">
                <view class="recommendation-item" v-for="item in recommendations" :key="item.lotBatchNo"
                <view class="recommendation-item" v-for="item in recommendations" :key="item.ifsBatchNo"
                    @click="selectRecommendation(item)">
                    <view class="recommendation-line">
                        <text class="recommendation-label">批号:</text>
                        <text class="recommendation-value">{{ item.lotBatchNo }}</text>
                        <text class="recommendation-value">{{ item.ifsBatchNo }}</text>
                    </view>
                    <!-- <view class="recommendation-line">
                        <text class="recommendation-label">零件描述:</text>
@@ -124,6 +124,7 @@
                productInputList: [],
                recommendations: [], // 推荐列表数据
                moOn: "",
                workstationId: "",
            };
        },
        onLoad() {
@@ -146,64 +147,68 @@
    },
  onLoad(option) {
      console.log(option.moOn); // 输出: value1
        this.moOn = option.moOn;
      this.moOn = option.moOn;
      this.workstationId = option.workstationId;
    },
    methods: {
            // 显示推荐列表
            showRecommendations() {
                // 当输入框获得焦点且为空时,显示默认推荐
                if (!this.keywords.trim()) {
                    this.loadDefaultRecommendations();
                }
                // if (!this.keywords.trim()) {
                //     this.loadDefaultRecommendations();
                // }
            },
            // 加载默认推荐
            loadDefaultRecommendations() {
                // 调用API获取默认推荐数据
                this.$u.api.cancelReporting
                        .fuzzyQuery()
                    .then((res) => {
                        console.log('默认推荐结果:', res.data);
                        this.recommendations = res.data || [];
                    })
                    .catch((err) => {
                        console.error('获取默认推荐失败:', err);
                        this.recommendations = [];
                    });
            },
            // // 加载默认推荐
            // loadDefaultRecommendations() {
            //     // 调用API获取默认推荐数据
            //     this.$u.api.cancelReporting
            //             .fuzzyQuery()
            //         .then((res) => {
            //             console.log('默认推荐结果:', res.data);
            //             this.recommendations = res.data || [];
            //         })
            //         .catch((err) => {
            //             console.error('获取默认推荐失败:', err);
            //             this.recommendations = [];
            //         });
            // },
            // 选择推荐项
            selectRecommendation(item) {
                console.log('选择推荐项:', item);
                console.log('选择推荐项:', this.moOn);
                this.$u.api.cancelReporting
                    .selInputPartInfoPDA({
                        outBatchNo: item.lotBatchNo,
                        partNo: item.partNo,
                        moOn: this.moOn,
                    })
                    .then((res) => {
                        const list = {
                            suppliedQuantity: res.data.suppliedQuantity,
                            ifsBatchNo: res.data.ifsBatchNo,
                            partNo: res.data.partNo,
                            partName: res.data.partName,
                            locationNo: res.data.locationNo,
                            ifsLineItemNo: res.data.ifsLineItemNo,
                            serialNo: res.data.serialNo,
                            engChgLevel: res.data.engChgLevel,
                            ifsWdr: res.data.waivDevRejNo,
                            activitySeq: res.data.activitySeq,
                        };
                        this.detailedList = list;
                // this.$u.api.cancelReporting
                //     .selInputPartInfoPDA({
                //         outBatchNo: item.lotBatchNo,
                //         partNo: item.partNo,
                //         moOn: this.moOn,
                //     })
                //     .then((res) => {
                //         const list = {
                //             suppliedQuantity: res.data.suppliedQuantity,
                //             ifsBatchNo: res.data.ifsBatchNo,
                //             partNo: res.data.partNo,
                //             partName: res.data.partName,
                //             locationNo: res.data.locationNo,
                //             ifsLineItemNo: res.data.ifsLineItemNo,
                //             serialNo: res.data.serialNo,
                //             engChgLevel: res.data.engChgLevel,
                //             ifsWdr: res.data.waivDevRejNo,
                //             activitySeq: res.data.activitySeq,
                //         };
                //         this.detailedList = list;
                //         this.showModal = true;
                //         // 清空输入框和推荐列表
                //         this.keywords = '';
                //         this.recommendations = [];
                //     });
                        this.detailedList = item;
                        this.detailedList.suppliedQuantity = item.availableStockQuantity;
                        this.showModal = true;
                        // 清空输入框和推荐列表
                        this.keywords = '';
                        this.recommendations = [];
                    });
                // this.detailedList = item;
                // this.detailedList.ifsBatchNo = item.lotBatchNo;
                // this.showModal = true;
            },
            updateArray(arr, newObj) {
@@ -232,8 +237,9 @@
            search(value) {
                if (value) {
                    this.$u.api.cancelReporting
                        .fuzzyQuery({
                            lotBatchNo: value,
                        .getStockNoPageByWorkstationId({
                            ifsBatchNo: value,
                            workstationId: this.workstationId,
                        })
                        .then((res) => {
                            console.log('模糊查询结果:', res.data);