车间订单取消下发接口联调

yyb

4 天以前 469dc45019c7fdc13a35ee9092181b7405dc6049

车间订单取消下发接口联调

 common/http.api.js

@@ -510,12 +510,30 @@
            // æŸ¥è¯¢å­ä»¶
            manufacturingOrder: (params = {}) => vm.$u.get('/mes/plan/manufacturingOrder/' + params.id),
            // æ£€æŸ¥æ ¡éªŒ
            checkRawPart: (params = {}) => vm.$u.post('/mes/product/checkRawPart/'+ params.operationTaskId,params),
			
            // checkRawPart: (params = {}) => vm.$u.post('/mes/product/checkRawPart/' + params.operationTaskId, params),
            // æ£€éªŒé›¶ä»¶
            checkRawPartPDA: (params = {}) => vm.$u.get('/mes/product/checkRawPartPDA/' +  params.outBatchNo + '/' + params
                .workstationId+ '/' + params
                .operationTaskId),
            // æäº¤
            feeding: (params = {}) => vm.$u.post('/mes/feeding', params),
            // æŸ¥è¯¢å·¥å•
            getOperationTaskLisByMoId: (params = {}) => vm.$u.get('/mes/operationTask/getOperationTaskLisByMoId',params),
            // æ ¹æ®å·¥å•id查询物料
            getMoMaterial: (params = {}) => vm.$u.get('/mes/operationTask/getMoMaterial', params),
            // æŸ¥è¯¢å·¥ä½œå°
            selWorkStation: (params = {}) => vm.$u.post('/mes/operationTask/selWorkStation', params)
        },
        // è½¦é—´è®¢å•å–消下发
        WorkshopOrderCancellationIssued: {

            // æ ¡éªŒæ˜¯å¦ä¸‹å‘çš„
            checkReturnPartPDA: (params = {}) => vm.$u.post('/mes/product/checkReturnPartPDA', params),
            // å–消下发
            cancelDTAOfWorkApplicationPDA: (params = {}) => vm.$u.get('/mes/feeding/getReturnLocations/' + params.workstationId),
            // èŽ·å–基本信息
            getReturnInfo: (params = {}) => vm.$u.post('/mes/feeding/getReturnInfo', params),
            // ç¡®è®¤å–消下发
            feeding: (params = {}) => vm.$u.put('/mes/feeding', params),
        },
        // ç§»åº“
        shiftingParking: {
@@ -523,7 +541,12 @@
            selPartInfoPDA: (params = {}) => vm.$u.get('/mes/stock/selPartInfoPDA/' + params.outBatchNo),
            // ç¡®è®¤ç§»åº“
            moveHousePDA: (params = {}) => vm.$u.post('/mes/applyPart/moveHousePDA', params),

			
        },
        // æ ¸ç£…录入
        NuclearScaleEntry: {
            // èŽ·å–客户名称
            selClient: (params = {}) => vm.$u.get('/mes/weighingVerification/selClient'),
        }
    };


 pages.json

@@ -831,6 +831,15 @@
        "navigationBarBackgroundColor": "#3281FF"
      }
    },
    // å·¥å•åˆ—表
        {
      "path": "pages/product/WorkshopOrderIssued/WorkOrderList",
      "style": {
        "navigationStyle": "custom",
        "navigationBarTextStyle": "white",
        "navigationBarBackgroundColor": "#3281FF"
      }
    },
    // è½¦é—´å–消下发
    {
      "path": "pages/product/WorkshopOrderCancellationIssued/index",

 pages/product/WorkshopOrderCancellationIssued/WorkOrderList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,305 @@
<template>
    <view class="page">
        <view class="finishProductIn-locno-bg" />
        <u-navbar title="工单列表" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
            back-icon-color="#000" />
        <view class="finishProductIn-locno-search">
            <u-search v-model="keywords" shape="square" bg-color="rgba(250,252,255,0.36)" :show-action="false"
                placeholder="请输入工单号" @clear="search" @custom="search" @search="search" @input="search">
            </u-search>
        </view>
        <view class="wrap">
            <scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="getmoreList()">
                <u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
                    <view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
                        @click="selectNo(item)">
                        <view class="content-header">
                            <view class="content-header-title">{{ item.index }}</view>
                        </view>
                        <view class="content-body">
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-1"> </view>
                                    <view class="_label-name">工单号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.optaskNo }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">数量：</view>
                                </view>
                                <view class="_content">
                                    {{ item.plannedQuantity }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">开始日期：</view>
                                </view>
                                <view class="_content">
                                    {{ item.plannedStartDate }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-3"> </view>
                                    <view class="_label-name">结束日期：</view>
                                </view>
                                <view class="_content">
                                    {{ item.plannedFinishDate }}
                                </view>
                            </view>
                        </view>
                    </view>
                </u-cell-group>
                <view class="loadmore" @click="getmoreList()">
                    <u-loadmore :status="status" :load-text="loadText" @loadmore="getmoreList()" />
                </view>
            </scroll-view>
        </view>
    </view>
</template>
<script>
    import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
    export default {
        data() {
            return {
                background: {
                    backgroundImage: `url(${content_bg})`,
                    backgroundAttachment: "fixed",
                    backgroundSize: "100% auto",
                    backgroundRepeat: "no-repeat",
                },
                keywords: "",
                list: [],
                total: 0,
                pageNum: 1,
                pageSize: 10,
                status: "loading",
                loadText: {
                    loadmore: "加载更多...",
                    loading: "努力加载中...",
                    nomore: "没有更多了",
                },
                id: ''
            };
        },
        onLoad(options) {
            console.log('22@@', options);
            this.id = Number(JSON.parse(decodeURIComponent(options.id)))
            this.getlist();
			
        },
        methods: {
            getmoreList() {
                if (this.pageSize >= this.total) {
                    this.status = "nomore";
                    return;
                }
                this.status = "loading";
                setTimeout(() => {
                    this.pageSize += this.pageSize;
                    this.getlist();
                }, 1000);
            },
            getlist() {
                this.$u.api.WorkshopOrderIssued.getOperationTaskLisByMoId({
                    current: this.pageNum,
                    size: this.pageSize,
                    moId: this.id
                }).then((res) => {
                    console.log("res", res);
                    this.list = res.data.records;
                    this.total =  res.data.total;
                    if (this.pageSize >= this.total) {
                        this.status = "nomore";
                    } else {
                        this.status = "loadmore";
                    }
                });
            },
            search(value) {
                console.log("111", value);
                if (value) {
                    this.list = [];
                    this.pageSize = 10;
                    this.$u.api.WorkshopOrderIssued
                        .getOperationTaskLisByMoId({
                            current: this.pageNum,
                            size: this.pageSize,
                            optaskNo: value,
                                moId: this.id
                        })
                        .then((res) => {
                            console.log("res", res);
                            this.list = res.data.records;
                            this.total = res.data.total;
                            if (this.pageSize >= this.total) {
                                this.status = "nomore";
                            } else {
                                this.status = "loadmore";
                            }
                        });
                } else {
                    this.getlist();
                }
            },
            selectNo(no) {
                this.refreshLastPage(no);
            },

            //刷新上一个页面
            refreshLastPage(no) {
                // å‘ŠçŸ¥ A.vue æ›´æ–°æ•°æ®
                // èŽ·å–页面栈
                let pages = getCurrentPages();

                // èŽ·å–上一页栈
                let prevPage = pages[pages.length - 2];

                // è§¦å‘上一页 upData å‡½æ•°(并携带参数)
                prevPage.$vm.workNo(no);

                // è¿”回上一页
                uni.navigateBack({
                    delta: 1,
                });
            },
        },
    };
</script>
<style lang="scss" scoped>
    .finishProductIn-locno-bg {
        background-color: #f6f9ff;
        background-image: url("~@/static/custom/finishProductIn/locNoBg.png");
        // background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
        padding: 0 20rpx;
        background-attachment: fixed;
        background-size: 100% auto;
        background-repeat: no-repeat;
        position: fixed;
        top: 0;
        bottom: 0;
        width: 100%;
        z-index: -1;
    }

    .finishProductIn-locno-search {
        padding: 40rpx 30rpx 20rpx 30rpx;
    }

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

    .finishProductIn-locno-scroll-list-group {
        ::v-deep .u-cell-item-box {
            background-color: rgba(250, 252, 255, 0.36) !important;
            padding: 0rpx 30rpx;
        }

        .content {
            font-size: 12px;
            background-color: #ffffff;
            box-sizing: border-box;
            border-radius: 10rpx;
            margin: 0rpx 0rpx 16rpx;
            padding: 20rpx 8rpx;
            box-shadow: none;
            display: flex;
            align-items: center;

            .content-header {
                width: 40rpx;
                height: 90rpx;
                display: flex;
                align-items: center;

                .content-header-icon {
                    background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
                    background-size: 100% auto;
                    background-repeat: no-repeat;
                    height: 28rpx;
                    width: 28rpx;
                }

                .content-header-title {
                    margin-left: 11rpx;
                    font-size: 26rpx;
                    font-weight: bold;
                    color: #333333;
                }
            }

            .content-body {
                flex: 1;
                background: #f5f9ff;
                border-radius: 10rpx;
                padding: 0rpx 23rpx;

                .row-list {
                    height: 60rpx;
                    display: flex;
                    flex-direction: row;
                    padding: 0px;
                    align-items: center;
                }

                .row-list ._label {
                    display: flex;
                    flex: 0.8;
                    color: #909399;
                    align-items: center;

                    ._label-icon-1 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-icon-2 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-icon-3 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-name {
                        width: 80px;
                        margin-left: 11rpx;
                        font-size: 26rpx;
                        font-weight: 500;
                        color: #666666;
                    }
                }

                .row-list ._content {
                    flex: 1.5;
                    text-align: right;
                    color: #909399;
                    font-size: 24rpx;
                }

                .row-list .s1 {
                    color: #d35651;
                }
            }
        }
    }
</style>

 pages/product/WorkshopOrderCancellationIssued/comp.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,321 @@
<template>
    <view class="page">
        <view class="finishProductIn-locno-bg" />
        <u-navbar title="车间订单物料" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
            back-icon-color="#000" />
        <view class="finishProductIn-locno-search">
            <u-search v-model="keywords" shape="square" bg-color="rgba(250,252,255,0.36)" :show-action="false"
                placeholder="请输入零件号" @clear="search" @custom="search" @search="search" @input="search">
            </u-search>
        </view>
        <view class="wrap">
            <scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="getmoreList()">
                <u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
                    <view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
                        @click="selectNo(item)">
                        <view class="content-header">
                            <view class="content-header-title">{{ item.index }}</view>
                        </view>
                        <view class="content-body">
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-1"> </view>
                                    <view class="_label-name">行号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">下发至库位：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-1"> </view>
                                    <view class="_label-name">零件号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.partNo }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-3"> </view>
                                    <view class="_label-name">零件描述：</view>
                                </view>
                                <view class="_content">
                                    {{ item.partName }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">零件下发数量：</view>
                                </view>
                                <view class="_content">
                                    {{ item.qpa }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-3"> </view>
                                    <view class="_label-name">物料行状态：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value5 }}
                                </view>
                            </view>
                        </view>
                    </view>
                </u-cell-group>
                <view class="loadmore" @click="getmoreList()">
                    <u-loadmore :status="status" :load-text="loadText" @loadmore="getmoreList()" />
                </view>
            </scroll-view>
        </view>
    </view>
</template>
<script>
    import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
    export default {
        data() {
            return {
                background: {
                    backgroundImage: `url(${content_bg})`,
                    backgroundAttachment: "fixed",
                    backgroundSize: "100% auto",
                    backgroundRepeat: "no-repeat",
                },
                keywords: "",
                list: [],
                total: 0,
                pageNum: 1,
                pageSize: 10,
                status: "loading",
                loadText: {
                    loadmore: "加载更多...",
                    loading: "努力加载中...",
                    nomore: "没有更多了",
                },
                operationTaskId: ''
            };
        },
        onLoad(options) {
            this.operationTaskId = JSON.parse(decodeURIComponent(options.operationTaskId))
            this.getlist();
        },
        methods: {
            getmoreList() {
                if (this.pageSize >= this.total) {
                    this.status = "nomore";
                    return;
                }
                this.status = "loading";
                setTimeout(() => {
                    this.pageSize += this.pageSize;
                    this.getlist();
                }, 1000);
            },
            getlist() {
                this.$u.api.WorkshopOrderIssued.getMoMaterial({
                    current: this.pageNum,
                    size: this.pageSize,
                    operationTaskId: this.operationTaskId
                }).then((res) => {
                    console.log("res", res);
                    this.list = res.data;
                    this.total = res.data.length + 1;
                    if (this.pageSize >= this.total) {
                        this.status = "nomore";
                    } else {
                        this.status = "loadmore";
                    }
                });
            },
            search(value) {
                console.log("111", value);
                if (value) {
                    this.list = [];
                    this.pageSize = 10;
                    this.$u.api.WorkshopOrderIssued
                        .getMoMaterial({
                            current: this.pageNum,
                            size: this.pageSize,
                            partNo: value,
                            operationTaskId: this.operationTaskId
                        })
                        .then((res) => {
                            console.log("res", res);
                            this.list = res.data;
                            this.total = res.data.total;
                            if (this.pageSize >= this.total) {
                                this.status = "nomore";
                            } else {
                                this.status = "loadmore";
                            }
                        });
                } else {
                    this.getlist();
                }
            },
            selectNo(no) {
                this.refreshLastPage(no);
            },

            //刷新上一个页面
            refreshLastPage(no) {
                // å‘ŠçŸ¥ A.vue æ›´æ–°æ•°æ®
                // èŽ·å–页面栈
                let pages = getCurrentPages();

                // èŽ·å–上一页栈
                let prevPage = pages[pages.length - 2];

                // è§¦å‘上一页 upData å‡½æ•°(并携带参数)
                prevPage.$vm.compNo(no);

                // è¿”回上一页
                uni.navigateBack({
                    delta: 1,
                });
            },
        },
    };
</script>
<style lang="scss" scoped>
    .finishProductIn-locno-bg {
        background-color: #f6f9ff;
        background-image: url("~@/static/custom/finishProductIn/locNoBg.png");
        // background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
        padding: 0 20rpx;
        background-attachment: fixed;
        background-size: 100% auto;
        background-repeat: no-repeat;
        position: fixed;
        top: 0;
        bottom: 0;
        width: 100%;
        z-index: -1;
    }

    .finishProductIn-locno-search {
        padding: 40rpx 30rpx 20rpx 30rpx;
    }

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

    .finishProductIn-locno-scroll-list-group {
        ::v-deep .u-cell-item-box {
            background-color: rgba(250, 252, 255, 0.36) !important;
            padding: 0rpx 30rpx;
        }

        .content {
            font-size: 12px;
            background-color: #ffffff;
            box-sizing: border-box;
            border-radius: 10rpx;
            margin: 0rpx 0rpx 16rpx;
            padding: 20rpx 8rpx;
            box-shadow: none;
            display: flex;
            align-items: center;

            .content-header {
                width: 40rpx;
                height: 90rpx;
                display: flex;
                align-items: center;

                .content-header-icon {
                    background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
                    background-size: 100% auto;
                    background-repeat: no-repeat;
                    height: 28rpx;
                    width: 28rpx;
                }

                .content-header-title {
                    margin-left: 11rpx;
                    font-size: 26rpx;
                    font-weight: bold;
                    color: #333333;
                }
            }

            .content-body {
                flex: 1;
                background: #f5f9ff;
                border-radius: 10rpx;
                padding: 0rpx 23rpx;

                .row-list {
                    height: 60rpx;
                    display: flex;
                    flex-direction: row;
                    padding: 0px;
                    align-items: center;
                }

                .row-list ._label {
                    display: flex;
                    flex: 0.8;
                    color: #909399;
                    align-items: center;

                    ._label-icon-1 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-icon-2 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-icon-3 {
                        background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
                        background-size: 100% auto;
                        background-repeat: no-repeat;
                        height: 26rpx;
                        width: 26rpx;
                    }

                    ._label-name {
                        width: 80px;
                        margin-left: 11rpx;
                        font-size: 26rpx;
                        font-weight: 500;
                        color: #666666;
                    }
                }

                .row-list ._content {
                    flex: 1.5;
                    text-align: right;
                    color: #909399;
                    font-size: 24rpx;
                }

                .row-list .s1 {
                    color: #d35651;
                }
            }
        }
    }
</style>

 pages/product/WorkshopOrderCancellationIssued/index.vue

@@ -1,4 +1,4 @@
//车间订单取消下发
// è½¦é—´è®¢å•å–消下发
<template>
  <view class="page">
    <view class="packing-registration-bg" />
@@ -17,15 +17,66 @@
            <text class="item-one">订单号</text>
          </view>
          <view class="packing-registration-param-item-right">
            <text class="item-one item-two" @click="seachPersonnelNo()">{{
            <text class="item-one item-two" @click="searchPersonnelNo()">{{
              registerInfo.moNo == "" ? "点击选择" : registerInfo.moNo
            }}</text>
            <u-icon
              name="arrow-right"
              color="#687792"
              size="28"
              @click="seachPersonnelNo()"
              @click="searchPersonnelNo()"
              v-show="registerInfo.moNo == ''"
            ></u-icon>
          </view>
        </view>
        <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">工单</text>
          </view>
          <view class="packing-registration-param-item-right">
            <text class="item-one item-two" @click="searchWork()">{{
              registerInfo.optaskNo == "" ? "点击选择" : registerInfo.optaskNo
            }}</text>
            <u-icon
              name="arrow-right"
              color="#687792"
              size="28"
              @click="searchWork()"
              v-show="registerInfo.optaskNo == ''"
            ></u-icon>
          </view>
        </view>
        <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">机台</text>
          </view>
          <view class="packing-registration-param-item-right">
            <picker
              class="item-one item-two"
              style="width: 100%; text-align: right"
              @change="machineChange($event, machineList)"
              :value="machineIndex"
              :range="machineList"
              range-key="label"
            >
              <view>
                <text
                  :style="{
                    color: machineIndex == null ? '#a5abb4' : '#a5abb4',
                  }"
                  >{{
                    machineIndex == null
                      ? "点击选择"
                      : machineList[machineIndex].label
                  }}</text
                >
              </view>
            </picker>
            <u-icon
              v-if="machineIndex == null"
              name="arrow-right"
              color="#687792"
              size="28"
            ></u-icon>
          </view>
        </view>
@@ -55,34 +106,18 @@
            <view class="content-body">
              <view class="row-list">
                <view class="_label">
                  <view class="_label-name">批号</view>
                  <view class="_label-name">批号：</view>
                </view>
                <view class="_content">
                  {{ item.moOn }}
                  {{ item.outBatchNo }}
                </view>
              </view>
              <view class="row-list">
                <view class="_label">
                  <view class="_label-name">零件号：</view>
                  <view class="_label-name">取消下发数量：</view>
                </view>
                <view class="_content">
                  {{ item.partNo }}
                </view>
              </view>
              <view class="row-list">
                <view class="_label">
                  <view class="_label-name">零件描述：</view>
                </view>
                <view class="_content">
                  {{ item.partName }}
                </view>
              </view>
              <view class="row-list">
                <view class="_label">
                  <view class="_label-name">取消下发数量</view>
                </view>
                <view class="_content">
                  {{ item.value3 }}
                  {{ item.suppliedQuantity }}
                </view>
              </view>
            </view>
@@ -107,23 +142,41 @@
                <text class="item-one">批号</text>
              </view>
              <view class="packing-registration-param-item-right">
                <text class="item-one item-two">{{ modalList.moOn }}</text>
                <text class="item-one item-two">{{
                  modalList.outBatchNo
                }}</text>
              </view>
            </view>
            <view class="packing-registration-param-item param-extra">
              <view class="packing-registration-param-item-left">
                <text class="item-one">零件号</text>
                <text class="item-one">库位</text>
              </view>
              <view class="packing-registration-param-item-right">
                <text class="item-one item-two">{{ modalList.partNo }}</text>
              </view>
            </view>
            <view class="packing-registration-param-item param-extra">
              <view class="packing-registration-param-item-left">
                <text class="item-one">零件描述</text>
              </view>
              <view class="packing-registration-param-item-right">
                <text class="item-one item-two">{{ modalList.partName }}</text>
                <picker
                  class="item-one item-two"
                  style="width: 100%; text-align: right"
                  @change="goSearch($event, locationNoList)"
                  :value="locationIndex"
                  :range="locationNoList"
                  range-key="label"
                >
                  <view>
                    <text
                      :style="{
                        color: locationIndex == null ? '#a5abb4' : '#a5abb4',
                      }"
                      >{{
                        locationIndex == null ? "点击选择" : locationIndex
                      }}</text
                    >
                  </view>
                </picker>
                <u-icon
                  v-if="locationIndex == null"
                  name="arrow-right"
                  color="#687792"
                  size="28"
                ></u-icon>
              </view>
            </view>
            <view class="packing-registration-param-item param-extra">
@@ -131,7 +184,10 @@
                <text class="item-one">取消下发数量</text>
              </view>
              <view class="packing-registration-param-item-right">
                <u-input class="item-one item-two" v-model="modalList.value3" />
                <u-input
                  class="item-one item-two"
                  v-model="modalList.returnQuantity"
                />
              </view>
            </view>
          </view>
@@ -147,9 +203,9 @@
  components: {
    scan,
  },

  data() {
    return {
      showModal: false,
      background: {
        backgroundImage: `url(${content_bg})`,
        backgroundAttachment: "fixed",
@@ -160,98 +216,240 @@
        fontSize: "32rpx",
        whiteSpace: "nowrap",
      },
      //弹窗列表
      // å¼¹çª—列表
      modalList: {
        partName: "",
        partNo: "",
        moNo: "",
        num: "",
        // locationNoName: "",
        // locationNo: "",
        // suppliedQuantity: "",
        // outBatchNo: "",
      },
      //   ä¸»é¡µé¢åˆ—表
      registerInfo: {
        operationTaskId: "",
        id: "",
        moNo: "",
        optaskNo: "",
        workstationId: "",
      },
      //   å–消下发记录列表
      hasScanSnList: [],
      codeInfoId: "",
      showModal: false,
      machineIndex: null,
      machineList: [],
      locationNoList: [],
      locationIndex: null,
    };
  },
  onShow() {
    let that = this;

    uni.$off("scan"); // æ¯æ¬¡è¿›æ¥å…ˆ ç§»é™¤å…¨å±€è‡ªå®šä¹‰äº‹ä»¶ç›‘听器
    if (registerInfo.moNO == null) {
      uni.showToast({
        icon: "none",
        title: "请先选择订单号！",
        duration: 2 * 1000,
      });
      return;
    }
    uni.$on("scan", function (data) {
      console.log("onscan");
      //扫码成功后的回调，你可以写自己的逻辑代码在这里
      console.log("扫码结果：", data.code);
      if (that.registerInfo.workstationId == "") {
        uni.showToast({
          icon: "none",
          title: "请先选择机台！",
          duration: 2 * 1000,
        });
        return;
      }
      if (data.code) {
        //扫码成功后的回调，你可以写自己的逻辑代码在这里
        console.log("扫码结果：", data.code);
        let codeInfo = JSON.parse(data.code);
        this.codeInfoId = codeInfo.id;
        if (codeInfo.moOn) {
        that.codeInfoId = codeInfo.id;
        if (codeInfo) {
          // æ‰«ææŠ¥å·¥å•äºŒç»´ç 
          that.scanHandle(data.code);
          that.scanHandle(codeInfo);
          that.$forceUpdate();
          that.getHandelList();
        }
      }
    });
  },
  methods: {
    getHandelList() {
      this.$u.api.workReporting
        .getProductMainV1({
          current: 1,
          size: -1,
          id: this.codeInfoId,
        })
        .then((res) => {
          this.hasScanSnList = res.data.productOutputList;
        });
    // åº“位选择
    goSearch(e, storage, code) {
      if (storage.length <= 0) {
        this.locationIndex = null;
        return;
      }
      this.locationIndex = e.target.label;
      this.modalList.locationNo = storage[this.locationIndex].label;
      this.modalList.locationId = storage[this.locationIndex].label;
    },
    // æ‰«ç åŽæ•°æ®å›žæ˜¾
    scanHandle(val) {
      let { moNo, partNo, partName } = val;
      this.modalList.moNo = moNo;
      this.modalList.partNo = partNo;
      this.modalList.partName = partName;

      this.showModal = true;
    //查询库位
    getHandymanItem(obj) {
      this.locationNoList = [];
      this.$u.api.WorkshopOrderCancellationIssued.cancelDTAOfWorkApplicationPDA(
        {
          workstationId: this.registerInfo.workstationId,
        }
      ).then((res) => {
        this.locationNoList = [];
        this.locationIndex = null;
        this.modalList.locationNo = "";
        if (res.code === 0 && res.data.length > 0) {
          res.data.forEach((item) => {
            const obj = Object.assign({
              label: item.locName,
              value: item.id,
            });
            this.locationNoList.push(obj);
          });
        }
        this.getReturnInfo(obj);
      });
    },
    // ç‚¹å‡»ç¡®è®¤åŽèŽ·å–下发记录
    //机台
    machineChange(e, storage, code) {
      this.hasScanSnList = [];
      if (storage.length <= 0) {
        this.machineIndex = null;
        return;
      }
      this.machineIndex = e.target.value;
      this.registerInfo.workstationId = storage[this.machineIndex].value;
    },
    // ç‚¹å‡»ç¡®è®¤åŽèŽ·å–消下发记录
    confirm() {
      if (!this.modalList.outBatchNo) {
        this.$u.toast("请输入批号");
        this.$refs.uModal.clearLoading(); // æ¸…除加载状态
        return;
      }
      if (!this.modalList.locationNo) {
        this.$u.toast("请输入库位");
        this.$refs.uModal.clearLoading(); // æ¸…除加载状态
        return;
      }
      if (!this.modalList.returnQuantity) {
        this.$u.toast("请输入取消下发数量");
        this.$refs.uModal.clearLoading(); // æ¸…除加载状态
        return;
      }
      // å¤„理确认逻辑
      this.$u.api.workReporting._(this.modalList).then((res) => {
      this.$u.api.WorkshopOrderCancellationIssued.feeding([
        this.modalList,
      ]).then((res) => {
        console.log("res", res);
        this.showModal = false;

        this.getHandelList();
        if (res.code === 0) {
          this.$u.toast("提交成功");
          this.showModal = false;
          const obj = {
            suppliedQuantity: this.modalList.suppliedQuantity,
            outBatchNo: this.modalList.returnQuantity,
          };
          this.hasScanSnList.push(obj);
        }
      });
    },
    // æ¨¡æ€æ¡†å–消
    cancel() {
      this.showModal = false; // å…³é—­å¼¹çª—
    },
    // å·¥å•å›žæ˜¾
    workNo(val) {
      this.machineList = [];
      this.machineIndex = null;
      this.registerInfo.workstationId = "";
      this.$u.api.WorkshopOrderIssued.selWorkStation(val).then((res) => {
        console.log("111", res);
        if (res.code === 0 && res.data.length > 0) {
          res.data.forEach((i) => {
            const obj = Object.assign({
              label: i.name,
              value: i.id,
            });
            this.machineList.push(obj);
          });
        }
      });
      this.registerInfo.optaskNo = val.optaskNo;
      this.registerInfo.operationTaskId = val.id;
      this.hasScanSnList = [];
    },
    // è®¢å•å·å›žæ˜¾
    setNo(val) {
      console.log("11111", val);
      this.registerInfo.moNo = val.moNo;
      (this.registerInfo = {
        operationTaskId: "",
        id: val.id,
        moNo: val.moNo,
        optaskNo: "",
        workstationId: "",
      }),
        (this.machineList = []);
      this.machineIndex = null;
      this.hasScanSnList = [];
    },
    //订单号
    seachPersonnelNo() {
    searchPersonnelNo() {
      console.log("车间订单号");
      uni.navigateTo({
        url: "/pages/product/report/orderList",
      });
    },
    //工单
    searchWork() {
      if (this.registerInfo.moNo == "") {
        this.$u.toast("请选择订单号");
        return;
      }
      console.log("子件");
      // ä½¿ç”¨uni.navigateTo方法跳转，并通过queryParams传递参数
      uni.navigateTo({
        url:
          "/pages/product/WorkshopOrderIssued/WorkOrderList?id=" +
          encodeURIComponent(JSON.stringify(this.registerInfo.id)),
      });
    },
    // æ‰«ç åŽæ•°æ®å›žæ˜¾
    scanHandle(val) {
      const { outBatchNo } = val;
      const { workstationId, operationTaskId } = this.registerInfo;
      const obj = {
        outBatchNo: outBatchNo,
        feedingWorkstationId: workstationId,
        operationTaskId: operationTaskId,
      };
      this.$u.api.WorkshopOrderCancellationIssued.checkReturnPartPDA(obj).then(
        (res) => {
          console.log("res", res);
          if (res.code === 0) {
            this.getHandymanItem(obj);
          }
        }
      );
    },
    //   èŽ·å–基本信息
    getReturnInfo(obj) {
      this.$u.api.WorkshopOrderCancellationIssued.getReturnInfo(obj).then(
        (res) => {
          console.log("res1", res);
          if (res.code === 0) {
            this.locationIndex = res.data.locationNo;
            res.data.outBatchNo = res.data.ifsBatchNo;
            console.log("1", res.data);
            this.modalList = res.data;
            this.showModal = true;
          }
        }
      );
    },
  },
};
</script>
<style lang="scss" scoped>
.popup-content {
  width: 600rpx;
  height: 350rpx;
  background-color: #fff;
  border-radius: 8px;
  z-index: 10;
  /* ç¡®ä¿å†…容在蒙版之上 */
}

.packing-registration-bg {
  background-color: #f6f9ff;
  background-image: url("~@/static/custom/packing/backBg.png");
@@ -284,7 +482,7 @@
  }

  .packing-registration-param-view {
    height: 180rpx;
    height: 450rpx;
    background-color: #fff;
    border-radius: 10rpx;
    padding: 0rpx 23rpx;
@@ -311,7 +509,7 @@

        .item-one {
          font-size: 30rpx;
          color: #333333;
          color: #060505;
          margin-right: 6rpx;
        }

@@ -336,7 +534,7 @@
}

.wrap .packing-registration-scroll-list {
  height: calc(100vh - var(--window-top) - var(--window-bottom) - 400rpx);
  height: calc(100vh - var(--window-top) - var(--window-bottom) - 550rpx);
  width: 100%;
}