yangan
2024-12-19 b373840eba0f163ecbdb471fd2206c539e995199
feat:库管发运日计划更改显示
4个文件已修改
87 ■■■■■ 已修改文件
api/globalApi.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/delivery-my/delivery-my/delivery-my.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/orderPlanList/index.vue 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/register/register.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/globalApi.js
@@ -809,6 +809,12 @@
        url: '/wrzs/warehouse/pvcConfirmLoadAndUnload',
        methods: 'POST'
    },
    //库管查询日计划
    getMyPlanListByBunkerIdsAndProductIds:{
        url:'/wrzs/warehouse/getMyPlanListByBunkerIdsAndProductIds',
        methods: 'GET'
    }
    
pages/driver-page/delivery-my/delivery-my/delivery-my.vue
@@ -39,8 +39,8 @@
                    v-model="isCarNo"
                    @change="radioChange"
                    placement="row">
                    <u-radio   labelSize="26" iconSize="36" label="是" name="是"></u-radio>
                    <u-radio   labelSize="26" iconSize="36"  label="否" name="否"></u-radio>
                    <u-radio   labelSize="26" iconSize="40" label="是" name="是" style="margin-right: 30rpx;"></u-radio>
                    <u-radio   labelSize="26" iconSize="40"  label="否" name="否"></u-radio>
                </u-radio-group>
                </u-form-item>
                <u-form-item prop="carNo"
pages/loadUnload-page/orderPlanList/index.vue
@@ -1,11 +1,6 @@
<template>
<div class="loadUnPage">
    <view class="history-numbers">
                    <view style="display:flex;" class="top">
                    <combined-title title="当前查询收发单:">
                    </combined-title>
                    <u-tag :text="isYuyue === 1 ? '未入场' : '全部'" class="topTag" @click="todoShow"></u-tag>
                    </view>
                    <scroll-view :scroll-top="scrollTop"
                        scroll-y="true"
                        class="scroll-Y">
@@ -63,10 +58,16 @@
                        v-for="(item, index) in orderPlanList"
                        :key="index">
                        <view class="formTop">
                            <text>{{item.startTime}} ~ {{item.endTime}}</text>
                            <!-- <text>{{item.startTime}} ~ {{item.endTime}}</text> -->
                            <!-- <view style="marginRight:20rpx">
                                    <text>发运日期:{{item.sendDate}}</text>
                            </view> -->
                            <view>客户名称:{{ item.customerName }}</view>
                            <view>订单编号:{{ item.orderCode }}</view>
                            <view>产品:{{ item.productNames || item.productName }}</view>
                            <view>包装类型:     {{proType[item.packingType]}}</view>
                            <view>计划车数:{{ item.carNum }}</view>
                            <view>领取车数:{{ item.lingNum }}</view>
                        </view>
                        <view class="formBottom">
                            <uni-table border stripe 
@@ -74,9 +75,6 @@
                    <uni-tr>
                        
                        <uni-th align="center" width='120'>车牌号</uni-th>
                        <uni-th align="center" width='200'>产品</uni-th>
                        <uni-th align="center" width='80'>产品等级</uni-th>
                        <uni-th align="center" width='80'>包装类型</uni-th>
                        <uni-th align="center" width='90'>计划量</uni-th>
                        <uni-th align="center" width='80'>实际量</uni-th>
                        <!-- <uni-th align="center" width='100'>皮重</uni-th>
@@ -85,27 +83,29 @@
                        <uni-th align="center" width='100'>数量</uni-th> -->
                        <!-- <uni-th align="center">仓库</uni-th> -->
                        <uni-th align="center" width='100'>状态</uni-th>
                        <uni-th align="center" width='100'>称重方式</uni-th>
                        
                    </uni-tr>
                    <uni-tr v-for="(subItem, index2) in item.tmTaskCoalList" :key="index2"
                    @click.native="showMore(subItem)"
                    <uni-tr v-for="(subItem, index2) in item.tmTaskCoals" :key="index2"
                    >
                   <uni-td align="center">
                            
                            <view>{{ subItem.carNo }}</view></uni-td>
                    <uni-td align="center">
                            <view>{{ subItem.productName }}</view></uni-td>
                            <uni-td align="center">
                            <view>{{ subItem.productGrade }}</view></uni-td>
                                <!-- subItem.planMeasure != void 0 ? subItem.planMeasure.toFixed(4) : '' -->
                            <view>{{  subItem.planMeasure}}</view></uni-td>
                            <uni-td align="center">
                            <view>{{proType[subItem.packingType]}}</view></uni-td>
                            <uni-td align="center">
                            <view>{{ subItem.planMeasure }}</view></uni-td>
                            <uni-td align="center">
                            <view>{{ subItem.productQuantity }}</view></uni-td>
                                <!-- subItem.productQuantity  != void 0 ? subItem.productQuantity.toFixed(4) : '' -->
                            <view>{{subItem.productQuantity }}</view></uni-td>
                    
                      <uni-td align="center">
                {{ subItem.statusView }}</uni-td>
                <uni-td align="right">
                            <u-tag :text="'计数'" plain v-if="subItem.isWeight==0"></u-tag>
                            <u-tag  :text="'称重'"  plain v-else-if="subItem.isWeight==1"></u-tag>
                            <u-tag :text="'称重计数'"  plain v-else-if="subItem.isWeight==2"></u-tag>
                            <u-tag v-else></u-tag></uni-td>
                     
                </uni-tr>
                </uni-table>
@@ -168,9 +168,19 @@
        init(){
            console.log('init',localStorage.getItem('bunkerIds'))
            uni.showLoading({ title: '加载中...' })
            this.$reqGet('getMyPlanListByBunkerId',{bunkerIds:localStorage.getItem('bunkerIds'),isYuyue:this.isYuyue,productIds:uni.getStorageSync('productIds') }).then((res) => {
                console.log(res,'res')
                this.orderPlanList = res.data;
            this.$reqGet('getMyPlanListByBunkerIdsAndProductIds',{bunkerIds:localStorage.getItem('bunkerIds'),productIds:uni.getStorageSync('productIds') }).then((res) => {
                this.orderPlanList = res.data.map(item=>{
                  item.tmTaskCoals && item.tmTaskCoals.map(el=>{
                    if(el.planMeasure != void 0 && el.planMeasure != ""){
                        console.log(el,'el')
                        el.planMeasure = el.planMeasure.toFixed(4);
                    }
                    if(el.productQuantity != void 0 && el.productQuantity != ""){
                        el.productQuantity = el.productQuantity.toFixed(4);
                    }
                  })
                    return item
                });
                uni.hideLoading();
            })
        },
@@ -257,15 +267,18 @@
        margin: 20rpx 0;
        .formTop{
            width: 100%;
            height: 100rpx;
            background: linear-gradient(-2deg, #ffffff 0%, #0055fe 100%);
            font-size: 40rpx;
            display: flex;
            align-items: center;
            justify-content: space-between;
            font-weight: bold;
            color: #fff;
            text-indent: 20rpx;
            height: 300rpx;
            padding: 10rpx;
            line-height:45rpx;
            padding-left: 20rpx;
            // background: linear-gradient(-2deg, #ffffff 0%, #0055fe 100%);
            // font-size: 40rpx;
            // display: flex;
            // align-items: center;
            // justify-content: space-between;
            // font-weight: bold;
            // color: #fff;
            // text-indent: 20rpx;
        }
    }
        /deep/ .uni-table{
pages/register/register.vue
@@ -769,7 +769,7 @@
              })
              .catch(err => {
                console.log('err', err);
                this.$u.toast('请规范输入内容');
                this.$u.toast('请规范输入内容(检查密码强度是否过低!)');
              });
        }
            },