zhangxiaoxu123
2022-07-29 ce114e1f7e349559c1abd106b83d7595d8646393
'日计划'
4个文件已修改
124 ■■■■ 已修改文件
components/common/combination-card/combination-card.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/jihua/jihua.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project.private.config.json 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/common/combination-card/combination-card.vue
@@ -2,7 +2,7 @@
    <!-- 组合卡片 -->
    <view class="combination-card">
        <view class="combination-card_wrapper">
            <view class="combination-card_top">
            <view class="combination-card_top" v-show="showTop">
                <view class="combination-card_top__content">
                    <slot name="top"></slot>
                </view>
@@ -10,7 +10,7 @@
            <view class="combination-card_content">
                <slot name="center"></slot>
            </view>
            <view class="combination-card_bottom">
            <view class="combination-card_bottom" v-show="showBottom">
                <slot name="bottom" a="$slots.name"></slot>
            </view>
        </view>
@@ -19,10 +19,23 @@
<script>
export default {
    props: {
        showTop: {
            type: Boolean,
            default: true
        },
        showBottom: {
            type: Boolean,
            default: true
        }
    },
    data() {
        return {};
    },
    methods: {}
    methods: {},
    mounted() {
        console.log(this.showTop,'showTop--------')
    }
};
</script>
pages/home/home.vue
@@ -198,6 +198,34 @@
                </view>
            </template>
        </combination-card>
        <combined-title title="日发运计划" detailsPath="/pages/jihua/jihua"></combined-title>
        <combination-card>
            <template v-slot:top :showTop="false"></template>
            <template v-slot:center>
                <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
                    <view class="jihua-main-line">
                        <view class="name">客户名称:{{item.customerName || ''}}</view>
                    </view>
                    <view class="jihua-main-line">
                        <view class="main-flex">
                            <view>煤种:{{item.order.coalName || ''}}</view>
                            <view>剩余量:{{item.order.executiveSurplus || ''}}</view>
                        </view>
                    </view>
                    <view class="jihua-main-line">
                        <view class="main-flex">
                            <view class="carNum-box">
                                <view>计划车数:</view>
                                <u--input placeholder="请输入发运车数" border="surround" v-model="item.numPlan"
                                    @change="inputTotalChange(item)"></u--input>
                            </view>
                            <view>实际发车数:{{item.order.numReal || ''}}</view>
                        </view>
                    </view>
                </view>
            </template>
            <template v-slot:bottom :showBottom="false"></template>
        </combination-card>
        <!-- 撤回模态框 -->
        <view class="wodeshenqingMotai">
@@ -279,6 +307,7 @@
            list3: ['https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png'],
            // 撤回模态框
            withDrawShow: false,
            fyData: [],
            withDrawData: {
                reason: '',
                id: '', // 撤回申请ID
@@ -378,6 +407,35 @@
            this.getProcessDataList(); // 申请列表
            this.todoList(); // 我的待办
            this.doneList(); // 我的已办
            this.xscarshippingdayplan();  //日计划
        },
        xscarshippingdayplan(allList) { //已经设置的
        console.log(allList,'allList==========')
            let params = {
                current: 1,
                size: 2,
                shippingDate: this.todayDate()
            }
            this.$reqGet('xscarshippingdayplan', params).then(res => {
                if (res.code == 0) {
                    this.fyData = res.data.records
                    uni.hideLoading();
                }
            }).catch(e => {
                uni.hideLoading();
            })
        },
        todayDate() {
            let yes = new Date().getTime()
            let date = new Date(yes)
            let y = date.getFullYear()
            let m = date.getMonth() + 1
            m = m < 10 ? ('0' + m) : m
            let d = date.getDate()
            d = d < 10 ? ('0' + d) : d
            const time = y + '-' + m + '-' + d
            console.log('todayDate---------', time)
            return time
        },
        getProcessDataList() {
            this.$reqGet('getProcessDataList', this.myApplicationParams).then(res => {
@@ -626,17 +684,14 @@
    width: 100%;
    .home_swipe {
        width: 100%;
        height: vww(160);
        .u-swiper {
            height: vww(160) !important;
            .u-swiper__wrapper {
                height: vww(160) !important;
                .uni-swiper-slides {
                    .u-swiper__wrapper__item {
                        .u-swiper__wrapper__item__wrapper {
                            .u-swiper__wrapper__item__wrapper__image {
                                height: vww(160) !important;
                            }
                        }
                    }
                }
pages/jihua/jihua.vue
@@ -283,6 +283,15 @@
            height: vww(16);
            width: vww(100);
        }
        .u-button{
            position: fixed!important;
            left: 50%;
            bottom: vww(20);
            width: vww(200)!important;
            transform: translateX(-50%);
            border-radius: vww(20);
            z-index: 9999;
        }
        .u-radio-group--row {
            height: 100%;
            width: 100%;
@@ -291,9 +300,12 @@
        }
        .u-radio__icon-wrap {
            width: vww(14) !important;
            height: vww(14) !important;
            ;
            width: vww(18) !important;
            height: vww(18) !important;
        }
        .u-icon__icon{
            font-size: vww(12)!important;
            line-height: vww(12)!important;
        }
    }
@@ -315,14 +327,14 @@
        display: flex;
        flex-direction: column;
        .xiugai-btn {
            position: fixed;
            left: 50%;
            bottom: vww(20);
            width: vww(200);
            transform: translateX(-50%);
            border-radius: vww(20);
        }
        // .xiugai-btn {
        //     position: absolute;
        //     left: 50%;
        //     bottom: vww(20);
        //     width: vww(200);
        //     transform: translateX(-50%);
        //     border-radius: vww(20);
        // }
    }
    .jihua-main {
project.private.config.json
@@ -2,7 +2,8 @@
  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "projectname": "group-app",
  "setting": {
    "compileHotReLoad": true
    "compileHotReLoad": true,
    "urlCheck": false
  },
  "condition": {
    "miniprogram": {
@@ -20,6 +21,13 @@
          "query": "",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/home/home",
          "query": "",
          "launchMode": "default",
          "scene": null
        }
      ]
    }