付延余
2022-08-23 a88092021b14abc67c2f2e53ce722d609632aeb5
修改日计划,我的待办,等相应bug
9个文件已修改
635 ■■■■ 已修改文件
api/global.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/jihua/jihua.vue 580 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/my-application/my-application.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/my-have-todo/my-have-todo.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/new-application-form-data/new-application-form-data.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/the-form-data/the-form-data.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/global.js
@@ -27,7 +27,7 @@
    });
}
// const baseUrl = 'http://192.168.3.159:9999'
// const baseUrl = 'http://192.168.0.159:9999'
// const baseUrl = 'https://mx.jzeg.cn:443/app';
const baseUrl = "https://mx.jzeg.cn:9998";
pages/home/home.vue
@@ -29,7 +29,7 @@
                                <text>所属流程:{{ item.processName }}</text>
                            </view>
                            <view class="">
                                <text>审批环节:{{ item.currTaskName }}</text>
                                <text>审批环节:{{ item.currTaskName || '' }}</text>
                            </view>
                        </view>
                        <view class="center-content__two center-margin">
@@ -62,7 +62,7 @@
                                <image src="@/static/home/jindu.png" mode=""></image>
                                <view>查看进度</view>
                            </view>
                            <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
                            <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2) && (item.procDefId == 'WAY_BILL:4:87504')">
                                <image src="@/static/home/biaodan.png" mode=""></image>
                                <view>表单数据</view>
                            </view>
@@ -70,7 +70,7 @@
                                <image src="@/static/home/history.png" mode=""></image>
                                <view>重新申请</view>
                            </view>
                            <view @click="editMyApplication(item)" v-if="item.status == 3">
                            <view @click="editMyApplication(item)" v-if="item.status == 3 && item.procDefId == 'WAY_BILL:4:87504'">
                                <image src="@/static/home/history.png" mode=""></image>
                                <view>编辑</view>
                            </view>
@@ -105,10 +105,10 @@
                    <view class="center-container">
                        <view class="center-content__one center-margin">
                            <view class="">
                                <text>任务名称:{{ item.name }}</text>
                                <text>任务名称:{{ item.name || '' }}</text>
                            </view>
                            <view class="">
                                <text>所属流程:{{ item.processName }}</text>
                                <text>所属流程:{{ item.processName || '' }}</text>
                            </view>
                        </view>
                        <view class="center-content__two center-margin">
@@ -162,7 +162,7 @@
                                <text>任务名称:{{ item.name }}</text>
                            </view>
                            <view>
                                <text>所属流程:{{ item.processName }}</text>
                                <text>所属流程:{{ item.processName || '' }}</text>
                            </view>
                        </view>
                        <view class="center-content__two center-margin">
@@ -175,7 +175,7 @@
                        </view>
                        <view class="center-content__three center-margin">
                            <view class="">
                                <text>审批意见:{{ item.comment }}</text>
                                <text>审批意见:{{ item.comment || '' }}</text>
                            </view>
                            <view class="">
                                <text>
@@ -198,7 +198,7 @@
                    <view class="bottom-container">
                        <!-- 已办按钮 -->
                        <view class="bottom-content__item">
                            <view @click="theFormDataClick(item.tableId)">
                            <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
                                <image src="@/static/home/biaodan.png" mode=""></image>
                                <view>表单数据</view>
                            </view>
pages/jihua/jihua.vue
@@ -1,8 +1,6 @@
<template>
    <view class="jihua-wrap">
        <view class="qiehuan-box">
            <u-tabs :list="tabList" @click="tabClick"></u-tabs>
        </view>
        <view class="qiehuan-box"><u-tabs :list="tabList" @click="tabClick"></u-tabs></view>
        <view class="jihua-main">
            <view class="shaixuan-box">
                <u-radio-group v-model="radioValue" @change="groupChange">
@@ -11,66 +9,61 @@
                    <!-- <u-radio shape="square" label="未设置的计划" name="未设置的计划"></u-radio> -->
                </u-radio-group>
            </view>
            <div class="main-inside">
            <view class="main-inside">
                <view v-if="isTomJihua == '全部'">
                    <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
                    <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 class="name">客户名称:{{item.customerName || ''}}</view> -->
                            <view class="name">收货单位:{{ item.customerAddressName || '' }}</view>
                        </view>
                        <view class="jihua-main-line">
                            <view class="main-flex">
                               <view>煤种:{{ item.coalName || ''}}</view>
                               <view>剩余量:{{ item.executiveSurplus || ''}}</view>
                                <view>煤种:{{ item.coalName || '' }}</view>
                                <view>剩余量:{{ item.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="inputChange"
                                      ></u--input>
                                    <u--input placeholder="请输入发运车数" border="surround" v-model="item.numPlan" @change="inputChange"></u--input>
                                </view>
                                <view>实际发车数:{{item.numReal || ''}}</view>
                                <view>实际发车数:{{ item.numReal || '' }}</view>
                            </view>
                        </view>
                    </view>
                    <u-button class="xiugai-btn" type="primary" text="提交" @click="dataFormSubmit"></u-button>
                </view>
                <view v-if="isTomJihua == '已设置的计划'">
                    <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
                    <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 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>煤种:{{ 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>
                                    <u--input placeholder="请输入发运车数" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)"></u--input>
                                </view>
                                <view>实际发车数:{{item.order.numReal || ''}}</view>
                                <view>实际发车数:{{ item.order.numReal || '' }}</view>
                            </view>
                        </view>
                    </view>
                    <u-button class="xiugai-btn" type="primary" text="修改" @click="getOrderCarNum"></u-button>
                </view>
                <!-- <u-empty
                <!-- <u-empty
                    v-if="fyData.length == 0"
                    mode="data"
                    icon=""
                >
                </u-empty> -->
            </div>
            </view>
        </view>
        <!-- 菜单栏 -->
        <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -78,137 +71,144 @@
</template>
<script>
    import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
    export default {
        components: {
            popupMenu
        },
        data() {
            return {
                radioValue: '全部',
                tabList: [{
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
export default {
    components: {
        popupMenu
    },
    data() {
        return {
            radioValue: '全部',
            tabList: [
                {
                    name: '今日发运计划'
                }, {
                    name: '明日发运计划'
                }],
                carValue: 0,
                fyData: [],
                fyData2: [],
                info: {
                    shippingDate: this.todayDate()
                },
                isTomJihua: '全部',
                editRow:'', //修改行的行
                menuShow:false,
                {
                    name: '明日发运计划'
                }
            ],
            carValue: 0,
            fyData: [],
            fyData2: [],
            info: {
                shippingDate: this.todayDate()
            },
            isTomJihua: '全部',
            editRow: '', //修改行的行
            menuShow: false
        };
    },
    onShow() {
        if (this.menuShow == true) {
            this.$refs.menuRef.menuClick();
        }
        this.init();
    },
    // 点击导航栏菜单后
    onNavigationBarButtonTap(e) {
        // console.log(e);
        this.$refs.menuRef.menuClick();
    },
    methods: {
        init() {
            this.fyList();
        },
        menushow(e) {
            this.menuShow = e;
        },
        dataFormSubmit() {
            //提交订单
            this.fyData.forEach(e => {
                e.shippingDate = this.info.shippingDate;
                if (e.planId && !e.numPlan) {
                    e.numPlan = -1; //删除设置为空的计划
                }
                let orderId = e.id;
                e.id = e.planId;
                e.orderId = orderId;
            });
            this.$reqPost('addObj', this.fyData).then(res => {
                this.$u.toast('添加成功');
                this.fyList();
            });
        },
        getOrderCarNum() {
            //修改
            this.$reqPost('setCarNums', this.editRow).then(res => {
                this.$u.toast('修改成功');
                this.xscarshippingdayplan();
            });
        },
        groupChange(n) {
            console.log(n, 'n================');
            this.isTomJihua = n;
            if (n == '已设置的计划') {
                this.xscarshippingdayplan();
            } else {
                this.fyList();
            }
        },
        onShow() {
            if(this.menuShow == true){
                this.$refs.menuRef.menuClick()
            }
            this.init()
        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;
        },
        // 点击导航栏菜单后
        onNavigationBarButtonTap(e) {
            // console.log(e);
            this.$refs.menuRef.menuClick()
        tomorrowDate() {
            let yes = new Date().getTime() + 60 * 24 * 60 * 1000;
            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('tomorrowDate---------222', time);
            return time;
        },
        methods: {
            init() {
                this.fyList()
            },
            menushow(e){
                this.menuShow = e;
            },
            dataFormSubmit() { //提交订单
                this.fyData.forEach(e => {
                    e.shippingDate = this.info.shippingDate
                    if (e.planId && !e.numPlan) {
                        e.numPlan = -1; //删除设置为空的计划
                    }
                    let orderId = e.id;
                    e.id = e.planId;
                    e.orderId = orderId;
                })
                this.$reqPost('addObj', this.fyData).then(res => {
                    this.$u.toast('添加成功')
                    this.fyList()
                })
            },
            getOrderCarNum() { //修改
                this.$reqPost('setCarNums',this.editRow).then(res => {
                    this.$u.toast('修改成功')
                    this.xscarshippingdayplan()
                })
            },
            groupChange(n) {
                console.log(n, 'n================')
                this.isTomJihua = n
                if (n == '已设置的计划') {
                    this.xscarshippingdayplan()
                } else {
                    this.fyList()
                }
            },
            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
            },
            tomorrowDate() {
             let yes = new Date().getTime() + 60 * 24 * 60 * 1000
                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('tomorrowDate---------222', time)
                return time
            },
            fyList() { //列表查询
                uni.showLoading({
                    title: '正在加载...'
                });
                let compId = uni.getStorageSync('userInfo').compId
                let params = {
                    current: 1,
                    size: 100,
                    status: 2,
                    trainType: 1,
                    compId: compId
                }
                this.$reqGet('fyList', params).then(res => {
                    if (res.code == 0) {
                        this.xscarshippingdayplan(res.data);
                    }
                })
            },
            xscarshippingdayplan(allList) { //已经设置的
            console.log(allList,'allList==========')
                let params = {
                    current: 1,
                    size: 50,
                    shippingDate: this.info.shippingDate
        fyList() {
            //列表查询
            uni.showLoading({
                title: '正在加载...'
            });
            let compId = uni.getStorageSync('userInfo').compId;
            let params = {
                current: 1,
                size: 100,
                status: 2,
                trainType: 1,
                compId: compId
            };
            this.$reqGet('fyList', params).then(res => {
                if (res.code == 0) {
                    this.xscarshippingdayplan(res.data);
                }
                this.$reqGet('xscarshippingdayplan', params).then(res => {
            });
        },
        xscarshippingdayplan(allList) {
            //已经设置的
            console.log(allList, 'allList==========');
            let params = {
                current: 1,
                size: 50,
                shippingDate: this.info.shippingDate
            };
            this.$reqGet('xscarshippingdayplan', params)
                .then(res => {
                    if (res.code == 0) {
                        if(!allList) {
                            this.fyData = res.data.records
                            console.log(this.fyData,'this.fyData=========11111111')
                        }else {
                            let l = res.data.records
                        if (!allList) {
                            this.fyData = res.data.records;
                            console.log(this.fyData, 'this.fyData=========11111111');
                        } else {
                            let l = res.data.records;
                            allList.forEach(e => {
                                l.forEach(ee => {
                                    if (e.id == ee.orderId) {
@@ -219,188 +219,186 @@
                                            e.carNums = ee.carNums;
                                        }
                                    }
                                })
                            })
                                });
                            });
                            this.fyData = allList;
                            console.log(this.fyData,'this.fyData=========22222222')
                            console.log(this.fyData, 'this.fyData=========22222222');
                        }
                        console.log(this.fyData,'this.fyData=========333333333')
                        console.log(this.fyData, 'this.fyData=========333333333');
                        uni.hideLoading();
                    }
                }).catch(e => {
                    uni.hideLoading();
                })
            },
            tabClick(item) { //切换今日和明日
                console.log(item, 'item==========')
                if (item.index == 1) {
                    this.info.shippingDate = this.tomorrowDate()
                    if (this.isTomJihua == '已设置的计划') {
                        this.xscarshippingdayplan()
                    } else {
                        this.fyList()
                    }
                .catch(e => {
                    uni.hideLoading();
                });
        },
        tabClick(item) {
            //切换今日和明日
            console.log(item, 'item==========');
            if (item.index == 1) {
                this.info.shippingDate = this.tomorrowDate();
                if (this.isTomJihua == '已设置的计划') {
                    this.xscarshippingdayplan();
                } else {
                    this.info.shippingDate = this.todayDate()
                    if (this.isTomJihua == '已设置的计划') {
                        this.xscarshippingdayplan()
                    } else {
                        this.fyList()
                    }
                    this.fyList();
                }
            },
            inputChange(val) {
               console.log(val)
            },
            inputTotalChange(val) {
                console.log(val,'val2=======val2')
                this.editRow = val
            } else {
                this.info.shippingDate = this.todayDate();
                if (this.isTomJihua == '已设置的计划') {
                    this.xscarshippingdayplan();
                } else {
                    this.fyList();
                }
            }
        },
        inputChange(val) {
            console.log(val);
        },
        inputTotalChange(val) {
            console.log(val, 'val2=======val2');
            this.editRow = val;
        }
    }
};
</script>
<style lang="scss" scoped>
    ::v-deep {
        .u-tabs__wrapper__nav {
            padding-left: vww(75.5)
        }
        .u-radio__text {
            span {
                font-size: vww(14);
            }
        }
        .u-radio{
            margin-right: vww(10);
        }
        .u-radio__text{
            font-size: vww(14)!important;
        }
        .u-input {
            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%;
            display: flex;
            justify-content: right;
        }
        .u-radio__icon-wrap {
            width: vww(18) !important;
            height: vww(18) !important;
        }
        .u-icon__icon{
            font-size: vww(12)!important;
            line-height: vww(12)!important;
        }
::v-deep {
    .u-tabs__wrapper__nav {
        padding-left: vww(75.5);
    }
    .qiehuan-box {
    .u-radio__text {
        span {
            font-size: vww(14);
        }
    }
    .u-radio {
        margin-right: vww(10);
    }
    .u-radio__text {
        font-size: vww(14) !important;
    }
    .u-input {
        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%;
        display: flex;
        justify-content: right;
    }
    .u-radio__icon-wrap {
        width: vww(18) !important;
        height: vww(18) !important;
    }
    .u-icon__icon {
        font-size: vww(12) !important;
        line-height: vww(12) !important;
    }
}
.qiehuan-box {
    position: fixed;
    top: 0;
    left: 0;
    right: 0;
    width: 100%;
    height:vww(44);
    // z-index: 1;
    background-color: #fff;
}
.jihua-wrap {
    width: 100%;
    height: 100%;
    // overflow-y: auto; // 会引起键盘弹出页面布局
    display: flex;
    flex-direction: column;
    // .xiugai-btn {
    //     position: absolute;
    //     left: 50%;
    //     bottom: vww(20);
    //     width: vww(200);
    //     transform: translateX(-50%);
    //     border-radius: vww(20);
    // }
}
.jihua-main {
    display: flex;
    flex-direction: column;
    width: 100%;
    padding: vww(0) vww(10) vww(70) vww(10);
    box-sizing: border-box;
    margin-top: vww(44);
    .main-inside {
        width: 100%;
        height: calc(100% - vww(44));
    }
    .shaixuan-box {
        height: vww(40);
        position: sticky;
        top: 0;
        top: vww(44);
        left: 0;
        right: 0;
        width: 100%;
        z-index: 1;
        // z-index: 1;
        background-color: #fff;
    }
    .jihua-wrap {
        width: 100%;
        height: 100%;
        overflow-y: auto;
        display: flex;
        flex-direction: column;
        // .xiugai-btn {
        //     position: absolute;
        //     left: 50%;
        //     bottom: vww(20);
        //     width: vww(200);
        //     transform: translateX(-50%);
        //     border-radius: vww(20);
        // }
    }
    .jihua-main {
        display: flex;
        flex-direction: column;
        width: 100%;
        padding: vww(0) vww(10) vww(70) vww(10);
    .main-block-box {
        box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8);
        height: vww(120);
        padding: vww(10);
        box-sizing: border-box;
        .main-inside {
            width: 100%;
            height: calc(100% - vww(44));
        margin-top: vww(12);
        border-radius: vww(8);
        &:first-child {
            margin-top: vww(5);
        }
        .shaixuan-box {
            height: vww(40);
            position: sticky;
            top: vww(44);
            left: 0;
            right: 0;
        .jihua-main-line {
            width: 100%;
            z-index: 1;
            background-color: #fff;
        }
            display: flex;
        .main-block-box {
            box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80);
            height: vww(120);
            padding: vww(10);
            box-sizing: border-box;
            margin-top: vww(12);
            border-radius: vww(8);
            &:first-child{
                margin-top: vww(5);
            view {
                font-size: vww(14);
            }
            .jihua-main-line {
            .name {
                font-weight: 600 !important;
            }
            .main-flex {
                width: 100%;
                display: flex;
                justify-content: space-between;
                view {
                    font-size: vww(14);
                    line-height: vww(32);
                }
                .name {
                    font-weight: 600 !important;
                }
                .main-flex {
                    width: 100%;
                .carNum-box {
                    display: flex;
                    justify-content: space-between;
                    view{
                    view {
                        font-size: vww(14);
                        line-height: vww(32);
                    }
                    .carNum-box {
                        display: flex;
                        view {
                            font-size: vww(14);
                            line-height: vww(32);
                        }
                    }
                }
            }
        }
    }
</style>
}
</style>
pages/login/login.vue
@@ -22,8 +22,6 @@
    data() {
        return {
            formData:{
                // username:'dongpang',
                // password:'dongpang!@#'
                username:'',
                password:''
            }
pages/my-application/my-application.vue
@@ -94,7 +94,7 @@
              <image src="@/static/home/jindu.png" mode=""></image>
              <view>查看进度</view>
            </view>
            <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
            <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 )&& (item.procDefId == 'WAY_BILL:4:87504')">
              <image src="@/static/home/biaodan.png" mode=""></image>
              <view>申请详情</view>
            </view>
pages/my-have-todo/my-have-todo.vue
@@ -59,7 +59,7 @@
                            </view>
                            <view class="center-content__three center-margin">
                                <view class="">
                                    <text>审批意见:{{ item.comment }}</text>
                                    <text>审批意见:{{ item.comment == 'undefined' ? '' : item.comment || '' }}</text>
                                </view>
                                <view class="">
                                    <text>
@@ -126,9 +126,7 @@
        <!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
        <!--返回顶部-->
    <view class="back-top-container">
      <u-back-top :scroll-top="scrollTop"></u-back-top>
    </view>
        <view class="back-top-container"><u-back-top :scroll-top="scrollTop"></u-back-top></view>
        <!-- 菜单栏 -->
        <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -594,14 +592,14 @@
        }
    }
  // 返回顶部
  .back-top-container{
    .u-transition{
      position:fixed;
      bottom:vww(80)!important;
      right:vww(20)!important;
    }
  }
    // 返回顶部
    .back-top-container {
        .u-transition {
            position: fixed;
            bottom: vww(80) !important;
            right: vww(20) !important;
        }
    }
    // 底部
    .bottomTabbar {
pages/new-application-form-data/new-application-form-data.vue
@@ -725,7 +725,7 @@
        quant: null,
        remark: '',
        startDate: '',
        type: '外销'
        type: ''
      },
      accountDetails: {},
      // 时间
@@ -1230,7 +1230,6 @@
        }
        this.selectContractShow = true;
      } else {
        this.$refs.formRef
            .validate()
@@ -1343,6 +1342,7 @@
      this.newFormData.contractName = e.contractName;
      this.newFormData.contractNum = e.num;
      this.newFormData.contractId = e.id;
            this.newFormData.type = e.type;
      this.selectContractShow = false;
      // 价格参数赋值
@@ -1607,6 +1607,7 @@
        if (this.editApplicationIndex != null) {
          this.newFormData.contractOrders[this.editApplicationIndex] = this.addContractFormdata;
        } else {
                    this.addContractFormdata.type = this.newFormData.type
          this.newFormData.contractOrders.push(this.addContractFormdata);
          console.log('添加子订单', this.addContractFormdata);
        }
pages/the-form-data/the-form-data.vue
@@ -108,7 +108,7 @@
                <view class="cardList-container">
                    <view class="cardList_item">
                        收货人:
                        <text>{{ item.customerName }}</text>
                        <text>{{ item.customerAddressName }}</text>
                    </view>
                    <view class="cardList_item">
                        <view class="">
@@ -128,7 +128,7 @@
                        </view>
                        <view class="">
                            运输:
                            <text>{{ item.trainType == 1 ? '路运' : '地销' }}</text>
                            <text>{{ item.trainType == 1 ? '地销' : '路运' }}</text>
                        </view>
                    </view>
                    <view class="cardList_item">
utils/request.js
@@ -82,7 +82,7 @@
    500: responseError
}
// let BaseUrl = 'http://192.168.3.159:9999';
// let BaseUrl = 'http://192.168.0.159:9999';
// const BaseUrl = 'https://mx.jzeg.cn:443/app';
const BaseUrl = "https://mx.jzeg.cn:9998";