Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp

spring

4 天以前 5fc7b0755d658b70c33c18b0531acb6e0ad28b17

Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp

 pages/wareHouse/inventory/index.vue

@@ -30,9 +30,9 @@
                    </view>
                    <view class="packing-registration-param-item-right">
                        <view class="item-one item-two" @click="openPN()">
                            <text>{{ registerInfo.value2 == '' ? "点击输入" : registerInfo.value2 }}</text>
                            <text>{{ registerInfo.value6 == '' ? "点击输入" : registerInfo.value6 }}</text>
                        </view>
                        <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value2 == ''"></u-icon>
                        <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value6 == ''"></u-icon>
                    </view>
                </view>
                <view class="packing-registration-param-item param-extra">
@@ -77,11 +77,42 @@
            <scroll-view class="packing-registration-scroll-list" scroll-y="true">
                <u-cell-group class="packing-registration-scroll-list-group" :border="false">
                    <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-请扫码-</div> -->
                    <view class="content" v-for="(x, index) in hasScanSnList" :key="index" :index="index">
                    <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
                        <view class="content-header">
                            <view class="content-header-title">{{ index + 1 }}</view>
                        </view>
                        <view class="content-body">
                        <view class="row-list">
                            <view class="row-list-left">
                                <view class="num-icon" style="color: #fff;">{{ index + 1 }}</view>
                                <view style="margin-left: 30rpx;">{{ x }}</view>
                                <view class="_label">
                                    <view class="_label-name">零件号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">批次号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">库位号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">盘点数量：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                        </view>
                    </view>
@@ -93,7 +124,7 @@
            <scan></scan>
            <!-- 零件号 -->
            <modalBg ref="openPN" :confirm="confirmPN">
                <u-field v-model="registerInfo.value2" label="零件号：" placeholder="请输入" :border-bottom="false">
                <u-field v-model="registerInfo.value6" label="零件号：" placeholder="请输入" :border-bottom="false">
                </u-field>
            </modalBg>
            <!-- 批次号 -->
@@ -108,7 +139,7 @@
            </modalBg>
            <!-- 盘点数量 -->
            <modalBg ref="openPhysicalInventory" :confirm="confirmPhysicalInventory">
                <u-field v-model="registerInfo.value5" label="盘点数量：" placeholder="请输入" :border-bottom="false">
                <u-field v-model="registerInfo.value5" label="盘点数量：" label-width="140" placeholder="请输入" :border-bottom="false">
                </u-field>
            </modalBg>
        </view>
@@ -140,9 +171,34 @@
                value2: '',
                value3: '',
                value4: '',
                value5: ''
                value5: '',
                value6: ''
            },
            hasScanSnList: [],
            hasScanSnList: [{
                value0: '11111111111111111111111',
                value1: '111',
                value2: '111',
                value3: '111',
            },
            {
                value0: '111',
                value1: '111',
                value2: '111',
                value3: '111',
            },
            {
                value0: '111',
                value1: '111',
                value2: '111',
                value3: '111',
            },
            {
                value0: '111',
                value1: '111',
                value2: '111',
                value3: '111',
            },
            ],
            delContent: null,
            staffList: [],
        };
@@ -173,12 +229,12 @@
        },
        // 弹框保存
        confirmPN() {
            console.log('保存', this.registerInfo.value2);
            console.log('保存', this.registerInfo.value6);
            // 请求接口，根据工单号查询其他信息并赋值
        },
        //批次号
        openBatch() {
            this.$refs.openBatch.openBatch();
            this.$refs.openBatch.open();
        },
        // 弹框保存
        confirmBatch() {
@@ -206,7 +262,9 @@

        setNo(val) {
            console.log('11111', val)
            this.registerInfo = val
            this.registerInfo.value1 = val.value1
            this.registerInfo.value2 = val.value2

        },
        //盘点报告号
        seachPersonnelNo() {
@@ -399,52 +457,75 @@
    }

    .content {
        background-image: url('~@/static/custom/packing/row_bg.png');
        background-size: 100% auto;
        background-repeat: no-repeat;
        height: 89rpx;
        width: 691rpx;
        font-size: 12px;
        background-color: #FFFFFF;
        background-color: #ffffff;
        box-sizing: border-box;
        border-radius: 10rpx;
        margin: 0rpx 0rpx 20rpx;
        padding: 0rpx 50rpx 0rpx 32rpx;
        margin: 0rpx 0rpx 16rpx;
        padding: 20rpx 8rpx;
        box-shadow: none;

        .row-list {
            height: 100%;
            display: flex;
            justify-content: space-between;
            align-items: center;
            padding-top: 0rpx !important;

            .row-list-left {
        .content-header {
            width: 40rpx;
            height: 90rpx;
                display: flex;
                color: #333333;
            align-items: center;

                .num-icon {
                    background-image: url('~@/static/custom/packing/num-bg.png');
            .content-header-icon {
                background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
                    background-size: 100% auto;
                    background-repeat: no-repeat;
                    height: 38rpx;
                    width: 38rpx;
                    text-align: center;
                    line-height: 38rpx;
                }
            }

            .row-list-right {
                display: flex;
                color: #428BF7;

                .del-icon {
                    background-image: url('~@/static/custom/packing/icon_dele.png');
                    background-size: 100% auto;
                    background-repeat: no-repeat;
                    height: 30rpx;
                height: 28rpx;
                    width: 28rpx;
                }

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

        .content-body {
            flex: 1;
            background-color: #ffffff;
            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-name {
                    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;
            }
        }
    }

 pages/wareHouse/moveWareHouse/index.vue

@@ -20,7 +20,54 @@
                </view>
            </view>
        </view>
        <view class="popup-container" v-if="show">
        <view class="wrap">
                    <scroll-view class="packing-registration-scroll-list" scroll-y="true">
                <u-cell-group class="packing-registration-scroll-list-group" :border="false">
                    <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-请扫码-</div> -->
                    <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
                        <view class="content-header">
                            <view class="content-header-title">{{ index+1 }}</view>
                        </view>
                        <view class="content-body">
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">零件号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">批次号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                                                        <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">库位号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                </view>
                            </view>
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-name">盘点数量：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                        </view>
                    </view>
                </u-cell-group>
            </scroll-view>
        </view>
        <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true" @confirm="confirm"
            @cancel="cancel">
            <view class="popup-content">
                <view class="packing-registration-param">
                    <view class="packing-registration-param-view">
@@ -65,15 +112,9 @@
                            </view>
                        </view>
                    </view>
                    <view class="person-btn-view">
                        <u-button type="primary" shape="square" text="取消" style="height: 80rpx; line-height: 80rpx"
                            size="medium" @click="closePopup()">取消</u-button>
                        <u-button type="primary" shape="square" text="确定" style="height: 80rpx; line-height: 80rpx"
                            size="medium" @click="confirmPopup()">确定</u-button>
                    </view>
                </view>
            </view>
        </view>
        </u-modal>
    </view>
</template>
<script>
@@ -96,7 +137,39 @@
                    storageLocation: "LG001",
                    num: 0,
                },
                show: true, // 控制弹窗显示隐藏的变量
                showModal: true, // 控制弹窗显示隐藏的变量
                hasScanSnList: [
                    {
                        value0: '11111111111111111111111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
                    },
                ],
            };
        },
        onLoad() {},
@@ -120,11 +193,11 @@
            });
        },
        methods: {
            confirmPopup() {
            confirm() {
                // 处理确认逻辑
                this.show = false;
            },
            closePopup() {
            cancel() {
                this.show = false; // 关闭弹窗
            },
        },
@@ -137,20 +210,9 @@
        margin-top: 300rpx;
    }

    .popup-container {
        position: fixed;
        top: 0;
        left: 0;
        right: 0;
        bottom: 0;
        display: flex;
        justify-content: center;
        align-items: center;
    }

    .popup-content {
        width: 600rpx;
        height: 600rpx;
        height: 500rpx;
        background-color: #fff;
        border-radius: 8px;
        z-index: 10;
@@ -240,4 +302,89 @@
            }
        }
    }
    .wrap .packing-registration-scroll-list {
        height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
        width: 100%;
    }

    .packing-registration-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: #626369;
      }
    }

    .content-body {
      flex: 1;
      background-color: #ffffff;
      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-name {
          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>