'解决冲突'

zhangxiaoxu123

2022-07-28 50072669bacb4c0fc842817ea0129cef98932d0b

'解决冲突'

 pages/edit-my-application/edit-my-application.vue

@@ -516,6 +516,7 @@
                                                        width: 43px;
                                                        font-size: 10px;
                                                        padding: 0;"
<<<<<<< Updated upstream
                              @click="addContractConsigneeConfirm(item)"
                          >
                            选择
@@ -674,6 +675,156 @@
    <!-- 菜单栏 -->
    <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
  </view>
=======
                                                        @click="addContractConsigneeConfirm(item)"
                                                    >
                                                        选择
                                                    </button>
                                                </text>
                                            </u-cell>
                                        </u-cell-group>
                                    </view>
                                    <view class="loadmoreClass">
                                        <u-loadmore loadmoreText="点击加载更多" nomoreText="无更多数据!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px"/>
                                    </view>
                                    <!-- 选择用户菜单项 -->
                                    <view class="selectCustomerCompSheet">
                                        <u-action-sheet
                                            :show="selectCustomerCompShow"
                                            :actions="selectCustomerActions"
                                            title="请选择单位"
                                            @close="selectCustomerCompShow = false"
                                            @select="selectCustomerSelect"
                                        ></u-action-sheet>
                                    </view>
                                    <!-- 级别菜单项 -->
                                    <view class="selectLevelSheet">
                                        <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
                                    </view>
                                </view>
                            </scroll-view>
                        </u-popup>
                    </view>

                    <!-- 品种选择器 -->
                    <view class="addContractCoalPicker">
                        <u-picker
                            :show="addContractCoalShow"
                            :columns="addContractCoalData"
                            @close="addContractCoalClose"
                            @cancel="addContractCoalShow = false"
                            @confirm="addContractCoalConfirm"
                            :closeOnClickOverlay="true"
                            keyName="label"
                        ></u-picker>
                    </view>

                    <!-- 运输选择器 -->
                    <view class="addContractCoalPicker">
                        <u-picker
                            :show="addContractTransportShow"
                            :columns="addContractTransportData"
                            @close="addContractTransportClose"
                            @cancel="addContractTransportShow = false"
                            @confirm="addContractTransportConfirm"
                            :closeOnClickOverlay="true"
                            keyName="label"
                        ></u-picker>
                    </view>
                </scroll-view>
            </u-popup>
        </view>

        <!-- 申请表格 -->

        <view class="newApplicationTable">
            <!-- <uni-table border stripe emptyText="暂无更多数据">
                <uni-tr v-for="(item, index) in 12" :key="index">
                    <uni-th align="center">字段标题</uni-th>
                    <uni-td>
                        <view class="text">输入/选择内容</view>
                        <view class="icon"><image src="@/static/icon/select.png" mode=""></image></view>
                    </uni-td>
                </uni-tr>
                <uni-tr>
                    <uni-th align="center">操作</uni-th>
                    <uni-td>
                        <view class="newApplicationTableUtil">
                            <u-button type="primary" text="修改" size="mini"></u-button>
                            <u-button type="error" text="删除" size="mini"></u-button>
                        </view>
                    </uni-td>
                </uni-tr>
            </uni-table> -->
            <view class="balanceNo" v-if="accountDetails.balanceTotal < 0"><text style="color:red;">客户账户当前处于欠款状态</text></view>

            <view class="messageCustomerBalance" v-if="accountDetails.balanceTotal >= 0">
                <text style="color: #FFA500;;">客户账户现汇余额:{{ accountDetails.balanceTotal }},承兑余额：{{ accountDetails.balance2 == null ? 0 : customerChengdui }}</text>
            </view>
            <u-swipe-action>
                <u-swipe-action-item @click="deleteContractCardClick" :options="options1" v-for="(item, index) in newFormData.contractOrders" :key="item.id">
                    <view class="cardList">
                        <view class="" class="cardListIcon" @click="editApplicationClick(item,index)">
                            <u-icon name="edit-pen" color="#2979ff" size="35"></u-icon>
                        </view>
                        <view class="cardList-container">
                            <view class="cardList_item">
                                收货人：
                                <text>{{ item.customerName }}</text>
                            </view>
                            <view class="cardList_item">
                                <view class="">
                                    矿厂：
                                    <text>{{ item.filedName }}</text>
                                </view>
                                <view class="">
                                    煤厂：
                                    <text>{{ item.compName }}</text>
                                </view>
                            </view>

                            <view class="cardList_item">
                                <view class="">
                                    品种：
                                    <text>{{ item.coalName }}</text>
                                </view>
                                <view class="">
                                    运输：
                                    <text>{{ item.trainType == 1 ? '地销':'路运'   }}</text>
                                </view>
                            </view>
                            <view class="cardList_item">
                                <view class="">
                                    单价：
                                    <text>{{ item.price }}</text>
                                </view>
                                <view class="">
                                    订单金额：
                                    <text>{{ item.amount }}</text>
                                </view>
                                <!-- <view class="">
                                            订单数量：<text>218.899</text>
                                        </view> -->
                            </view>
                        </view>
                    </view>
                </u-swipe-action-item>
            </u-swipe-action>

            <view class="addCard" @click="addContractClick">
                <view class="addCard-icon"><u-icon name="plus" size="100"></u-icon></view>
            </view>
        </view>

        <view class="new-application-button">
            <u-button text="取消" :plain="true" type="primary" @click="backPage"></u-button>
            <u-button text="确定" type="primary" @click="newApplicationFormDataClick"></u-button>
        </view>

        <!-- 菜单栏 -->
        <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
    </view>
>>>>>>> Stashed changes
</template>

<script>
@@ -687,6 +838,7 @@
month = month < 10 ? `0${month}` : month;
const date = d.getDate();
export default {
<<<<<<< Updated upstream
  data() {
    return {
      applicationOrderIndex: null,
@@ -1892,6 +2044,1216 @@
      });
    }
  }
=======
    data() {
        return {
            applicationOrderIndex:null,
			
            tdStyle: 'max-height: 30px;overflow: scroll;',
            spanStyle: 'overflow:auto',
            newFormData: {
                amount: null,
                coalId: '',
                coalName: '',
                contractId: 169,
                contractName: '',
                contractNum: '',
                contractOrders: [],
                customerAddressId: '',
                customerId: 236,
                customerName: '',
                endDate: '',
                executiveQuant: null,
                id: null,
                number: '',
                payType: '',
                price: null,
                quant: null,
                remark: '',
                startDate: '',
                type: '外销'
            },
            accountDetails: {},
            // 时间
            timeDataStr: '',
            menuShow: false,
            // 表单
            // selectCustomerShow: false, // 选择用户弹框
            showPayType: false, // 付款方式弹框
            payData: [],
            actions: [],
            selectValue: '',
            rules: {
                customerName: [
                    {
                        required: true,
                        message: '请选择结算客户',
                        trigger: ['blur', 'change']
                    }
                ],
                contractNum: [
                    {
                        required: true,
                        message: '请选择合同编号',
                        trigger: ['blur', 'change']
                    }
                ],
                payType: [
                    {
                        required: true,
                        message: '请选择付款方式',
                        trigger: ['blur', 'change']
                    }
                ],
                startDate: [
                    {
                        required: true,
                        message: '请选择时间',
                        trigger: ['blur', 'change']
                    }
                ]
            },
            // 时间
            timeShow: false,
            mode: 'range',
            maxDate: `${year}-${month}-${date + 70}`,
            // 选择客户
            selectCustomerData: {
                compIds: '',
                customerName: '',
                level: '',
                current: 1,
                size: 10
            },
            status:'loadmore',
            customerDataAllNum:0,//客户列表总条数
            account: null, //客户账户信息
            // 搜索字段
            selectCompsData: [],
            selectCustomerLevel: [],
            searchCustomerForm: {
                compName: '',
                levelText: ''
            },
            customerData: [],
            // 选择单位
            selectCustomerCompShow: false,
            selectCustomerActions: [],
            // 级别
            selectLevelShow: false,
            levelList: [{ name: '一星级', value: 'A' }, { name: '二星级', value: 'B' }, { name: '三星级', value: 'C' }, { name: '四星级', value: 'D' }, { name: '五星级', value: 'E' }],
            // 选择合同
            // selectContractShow: false,
            // searchContractForm: {
            //     current: 1,
            //     size: 10,
            //     num: '',
            //     startDate: '',
            //     endDate: '',
            //     result: 2,
            //     type: '',
            //     customerName: ''
            // },
            // contractData: [],
            // 类型
            // selectContractTypeShow: false,
            // selectContractTypeData: [[]],
            // 时间
            // selectContractTimeMode: 'single',
            // selectContractStartTimeShow: false,
            // selectContractEndTimeShow: false,
            // 添加合同
            addContractShow: false,
            // 添加合同表单
            addContractRules: {},
            addContractFormdata: {
                amount: null,
                coalId: null,
                coalName: '',
                compId: null,
                compName: '',
                cost1: '',
                cost2: '',
                customerId: null,
                customerName: '',
                edit: true,
                favouredpolicyIds: '',
                filedId: null,
                filedName: '',
                fromStation: '',
                modifyId: null,
                modifyInfoId: null,
                customerAddressId: null,
                price: null,
                priceMode: '0',
                quant: '',
                toStation: '',
                trainType: 1,
                type: ''
				
            },
            contractDetails: [], // 选择的合同详情
            // 选择煤厂
            coalFiledSelectShow: false,
            coalfiledData: [],
            coalfiledParams: { current: 1, size: 10 },
            selectCoalFiledData: {},
            // 选择收货人
            addContractConsigneeShow: false,
            // 品种选择器
            addContractCoalShow: false,
            addContractCoalData: [[]],
            // 运输类型

            // 优惠
            favouredpolicyListAll: [], //优惠政策列表所有的
            favouredpolicyList: [], // 优惠政策列表
            multipleSelection: [], //选中的优惠政策
            selectOKfavouredpolicyValue:[],//复选框选中
            // 单选框
            addContractTransport: '',
            // 品种价格表格
            loading: false,
            // 价格请求参数
            getNewPriceData: {
                // compId: 133,
                // compName: '邢台矿',
                // customerAddressName: '邢台国泰发电有限责任公司',
                // customerAddressId: 236,
                // coalId: 45,
                // coalName: '',
                // trainType: 1,
                // fromStation: '小康庄',
                // toStation: '小康庄',
                // quant: '',
                // price: '',
                // amount: '',
                // priceMode: null,
                // filedName: '邢台矿主煤场',
                // filedId: 4,
                // type: '',
                // cost1: '',
                // cost2: '',
                // edit: true
            },
            dust: null, // 抑尘费
            trainfreight: {}, //路运运费
            // 运输类型
            addContractTransportShow: false,
            addContractTransportData: [[{ label: '地销', value: 1 }, { label: '路运', value: 2 }]],
            currentCoal: {
                coalName: '',
                cokingPrice: null,
                modifyId: null,
                modifyInfoId: null,
                noImportantPrice: null,
                quotePrice: null,
                steelMillPrice: null,
                type: null
            },
            // 滑动单元格
            options1: [
                {
                    text: '删除'
                }
            ],
            editApplicationTableId:''
        };
    },
    onLoad(options){
        this.editApplicationTableId = JSON.parse(options.index);
		
    },
    onShow() {
        if (this.menuShow == true) {
            this.$refs.menuRef.menuClick();
        }
        this.init();
    },
    // 点击导航栏菜单后
    onNavigationBarButtonTap(e) {
        this.$refs.menuRef.menuClick();
    },
    computed: {
        afterPrice() {
            let temp = {
                coalName: "",
                cokingPrice: 0,
                modifyId: 0,
                modifyInfoId: 0,
                noImportantPrice: 0,
                quotePrice: 0,
                steelMillPrice: 0,
                type: null
            }
            temp = Object.assign({},this.currentCoal);
            // temp.coalName = this.currentCoal.coalName
            // temp.cokingPrice = this.currentCoal.cokingPrice
            // temp.modifyId = this.currentCoal.modifyId
            // temp.modifyInfoId = this.currentCoal.modifyInfoId
            // temp.noImportantPrice = this.currentCoal.noImportantPrice
            // temp.quotePrice = this.currentCoal.quotePrice
            // temp.steelMillPrice = this.currentCoal.steelMillPrice
            // temp.type = this.currentCoal.type
			
            let favouredpolicyIds = '';
            if (this.favouredpolicyList.length > 0) {
                this.multipleSelection.forEach(e => {
                    if (favouredpolicyIds.length > 0) {
                        favouredpolicyIds += ',';
                    }
                    favouredpolicyIds += e.id;
                    temp.steelMillPrice -= e.price;
                    temp.cokingPrice -= e.price;
                    temp.noImportantPrice -= e.price;
                    temp.quotePrice -= e.price;
                });
                if (this.multipleSelection.length > 0) {
                    this.addContractFormdata.favouredpolicyIds = favouredpolicyIds;
                }
            }
            console.log(temp,'after-------temp')
            return temp;
        },
        showPrice() {
            if (this.addContractFormdata) {
                let row = this.addContractFormdata;
                if (row.compId && row.customerAddressId && row.coalId) {
                    // this.rowClik(this.currentRow);
                    return true;
                }
            }
            return false;
        },
        //优惠政策
        favouredpolicyListcomputed() {
            let list = [];
            this.favouredpolicyListAll.forEach(e => {
                //支付方式
                if (e.type.indexOf('B') != -1 && e.coalIds) {
                    if (e.coalIds.indexOf(this.addContractFormdata.coalId) != -1) {
                        list.push(e);
                    }
                }
                //运距
                if (this.addContractFormdata.trainType == 2) {
                    if (e.type.indexOf('A') != -1) {
                        //根据发站到站获取运距
                        list.push(e);
                    }
                }
            });
            this.favouredpolicyList = list;

            return true;
        },
        async currentRowComputed() {
            // return true
            console.log('currentRowComputed-------------进来',this.addContractFormdata,'this.addContractFormdata-----');
		
            //变价格用的
            this.changePriceMode(this.addContractFormdata.priceMode);

            //变订单量
            if (this.addContractFormdata.price > 0 && (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
                let price = this.addContractFormdata.price;
                if (this.addContractFormdata.trainType == 1) {
                    console.log('地销');
                    let q = this.addContractFormdata.amount / price;
                    this.addContractFormdata.quant = q.toFixed(2);
                    this.addContractFormdata.cost1 = null; //运费
                    this.addContractFormdata.cost2 = null; //抑尘费
                } else if (this.addContractFormdata.trainType == 2&& (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
                    console.log('路运',this.addContractFormdata,'this.addContractFormdata-----');
                    //如果路运价格增加抑尘费和运费
                    let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //路运运费
                    price += cost1Price;
                    price += this.dust;
                    this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //运费
                    this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //抑尘费
			
                    let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
                    this.addContractFormdata.amount = amount.toFixed(2);
					
                }
            } else {
                this.addContractFormdata.quant = null;
            }
            // if (this.currentRow.quant > 0 && this.currentRow.price > 0) {
            //   this.currentRow.amount = this.currentRow.quant * this.currentRow.price;
            //   return true;
            // }
            return true;
        }
        // accountMsg() {
        //     this.accountMsgType = 'error';
        //     if (this.accountDetails) {
        //         if (this.accountDetails.balanceType == '贷') {
        //             return '客户账户余额当前处于欠款状态！';
        //         } else {
        //             let amount = 0;
        //             this.newFormData.contractOrders.forEach(e => {
        //                 amount += Number(e.amount);
        //             });
        //             if (this.newFormData.payType == '0') {
        //                 if (this.accountDetails.balance < amount) {
        //                     return '客户账户现汇余额不足，现汇余额:' + this.accountDetails.balance;
        //                 }
        //             } else {
        //                 if (this.accountDetails.balance2 < amount) {
        //                     return '客户账户承兑余额不足，承兑余额:' + this.accountDetails.balance2;
        //                 }
        //             }
        //         }
        //         this.accountMsgType = 'warning';
        //         return '客户账户现汇余额:' + this.accountDetails.balance + '，承兑余额:' + (this.accountDetails.balance2 ? this.accountDetails.balance2 : 0);
        //     }
        //     return null;
        // }
    },
    watch: {
        // 立即处理 进入页面就触发 // immediate: true,
        // 深度监听 属性的变化// deep: true
        // 选择客户查询条件
        'searchCustomerForm.compName'(newV, oldV) {
            if (newV == '') {
                this.selectCustomerData.compIds = '';
            }
        },
        'searchCustomerForm.levelText'(newV, oldV) {
            if (newV == '') {
                this.selectCustomerData.level = '';
            }
        },
        // 'selectOKfavouredpolicyValue'(newV,oleV){
        // }
    },
    components: {
        popupMenu,
        combinationTitle
    },
    methods: {
        async jisuanAmount() {
            console.log('进入计算');
            if (this.addContractFormdata.trainType == 2) {
                let price = this.addContractFormdata.price;
                //如果路运价格增加抑尘费和运费
                let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //路运运费
                price += cost1Price;
                price += this.dust;
                this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //运费
                this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //抑尘费
                let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
                this.addContractFormdata.amount = amount.toFixed(2);
            }
        },
        init() {
            this.jcfavouredpolicyitem();
            this.coalfiled();
            this.coalprice();
            this.operato();
            this.pay_type();
            this.others_params();
            this.fetchCompTree();
            this.getFavouredPolicyItem();
            this.editApplicationFormData(); // 修改申请表单详情
        },
        editApplicationFormData(){
            this.$reqGet('formData',{},this.editApplicationTableId).then(res=>{
                this.newFormData = res.data;
                console.log(this.newFormData.contractOrders,'初始化列表-----------newFormData----------初始化')
                this.timeDataStr = this.newFormData.startDate;
            })
        },
        editApplicationClick(item,index){
            console.log(item,'item=========')
            this.applicationOrderIndex = index;// 待修改订单index
            this.addContractFormdata = item;
            console.log(this.addContractFormdata,'this.addContractFormdata=============点击进来的某列')
            this.addContractFormdata.priceMode = item.priceMode.toString();
            // 修改订单优惠初始化
            if(item.favouredpolicyIds){
                item.favouredpolicyIds.split(',').map(e=>{
                    this.selectOKfavouredpolicyValue.push(Number(e));
                });
            }
			
			
            // 获取价格
            // this.getNewPriceData = this.addContractFormdata;
            this.getNewPriceData.type = this.newFormData.type;
            this.getNewPriceData.customerAddressName = this.addContractFormdata.customerFullName;
            this.getNewPriceData.customerAddressId = this.addContractFormdata.id;
            this.getNewPriceData.toStation = this.addContractFormdata.toStation;
            this.getNewPriceData.coalId = this.addContractFormdata.coalId;
            this.getNewPriceData.coalName =this.addContractFormdata.coalName;
            // 获取合同煤种价格
            this.getNewPrice();
			
            // 初始化第一次优惠价格计算
            // this.$nextTick(()=>{
                if(this.selectOKfavouredpolicyValue.length == 0){
                    this.multipleSelection = [];
                } else {
                    this.multipleSelection = [];
                    this.favouredpolicyList.forEach((item)=>{
                        if(this.selectOKfavouredpolicyValue.indexOf(item.id) != -1){
                            this.multipleSelection.push(item);
                        }
                    })
                }
            // })
			
            // 订单运输类型
            switch(this.addContractFormdata.trainType){
                case 1:
                this.addContractTransport = '地销';
                break;
                case 2:
                this.addContractTransport = '路运';
                break;
            }
			
            // 获取合同详情，煤种
            this.getContractDetails();
			
            this.changePriceMode(this.addContractFormdata.priceMode);
			
            this.$nextTick(()=>{
                this.addContractShow = true;				
            })
			
        },
        getContractDetails(){
            uni.showLoading({
                title:'加载中...'
            })
            this.$reqGet('getByContractId',{},this.newFormData.contractId).then(res=>{
                uni.hideLoading();
                if(res.code == 0){
                    this.contractDetails = res.data;
                }
            })
            this.$nextTick(()=>{
                this.contractDetails.forEach(item => {
                    let a = [{ label: '', id: '' }];
                    a[0].label = item.coalName;
                    a[0].id = item.coalId;
                    if (this.addContractCoalData[0]) {
                        this.addContractCoalData = [];
                    }
                    this.addContractCoalData.push(a);
                });
            })
        },
        checkboxChangeFavouredpolicy(e){
            // this.selectOKfavouredpolicyValue = e;
            if(e.length == 0){
                this.multipleSelection = [];
            } else {
                this.multipleSelection = [];
                this.favouredpolicyList.forEach((item,i)=>{
                    if(e.indexOf(item.id) != -1){
                        this.multipleSelection.push(item);
                    }
                })
            }
			
        },
        // 选择客户
        selectCustomer() {
            this.selectLevelShow = false;
            this.selectCustomerCompShow = false;
            uni.showLoading({
                title: '加载中...'
            });
            // this.selectCustomerShow = true;
            this.selectCustomerData.current = 1;
            this.$reqGet('customer', this.selectCustomerData).then(res => {
                uni.hideLoading();
                if (res.code == 0) {
                    this.customerData = res.data.records;
                    this.customerDataAllNum = res.data.total;
                }
            });
        },
        // 客户选择弹框打开了
        // selectCustomerOpen() {
        //     // this.spanStyle = 'overflow:hidden'; //当蒙层弹起时，固定界面禁止滚动，当蒙层关闭时，允许滚动
        // },
        // selectCustomerClose() {
        //     // this.spanStyle = 'overflow:auto'; // 让html的body可滑动
        //     // this.selectCustomerShow = false;
        // },
        // 获取单位树
        fetchCompTree() {
            this.selectCustomerActions = [];
            this.$reqGet('fetchCompTree').then(res => {
                if (res.code == 0) {
                    let a = { name: '', id: '' };
                    a.name = res.data[0].name;
                    a.id = res.data[0].id;
                    this.selectCustomerActions.push(a);
                    res.data[0].children.forEach(item => {
                        let a = { name: '', id: '' };
                        a.name = item.name;
                        a.id = item.id;
                        this.selectCustomerActions.push(a);
                    });
                }
            });
        },
        // 客户选择框单位选择菜单
        selectCustomerSelect(v) {
            uni.hideKeyboard();
            this.selectCustomerData.compIds = v.id;
            this.searchCustomerForm.compName = v.name;
        },
        // 级别
        selectLevelSelect(v) {
            uni.hideKeyboard();
            this.selectCustomerData.level = v.value;
            this.searchCustomerForm.levelText = v.name;
        },
        // 付款类型
        sexSelect(v) {
            uni.hideKeyboard();
            this.selectValue = v.name;
            this.newFormData.payType = v.value;
            // this.newFormData.payType = e.name;
            // this.$refs.form1.validateField('userInfo.sex');
        },
        // 清空选择客户表单
        selectCustomerResetFields() {
            this.$refs.selectformRef.resetFields(); // 不起效果
            this.selectCustomerData.customerName = '';
            this.searchCustomerForm.compName = '';
            this.searchCustomerForm.levelText = '';
            this.selectCustomer();
        },
        selectCustomerOkClick(v) {
            this.newFormData.customerName = v.customerName;
            this.newFormData.customerId = v.id;
            this.$reqGet('getAccount', { customerId: v.id }).then(res => {
                this.accountDetails = res.data;

                this.searchContractForm.customerName = res.data.customerName;
            });
            this.$nextTick(() => {
                // this.selectCustomerShow = false;
            });
        },
        loadingCustomer(){
            if(this.selectCustomerData.current >= this.customerDataAllNum / 10) return;
            this.status = 'loading';
            this.selectCustomerData.current = ++this.selectCustomerData.current;
            this.$reqGet('customer', this.selectCustomerData).then(res => {
                if(this.selectCustomerData.current >= this.customerDataAllNum / 10){
                    this.status = 'nomore';
                    this.$u.toast('没有更多数据了！')
                }
                uni.hideLoading();
                if (res.code == 0) {
                    this.customerDataAllNum = res.data.total;
                    this.customerData = this.customerData.concat(res.data.records);
                    this.status = 'loadmore';
                }
            });
        },
        // 时间
        confirmTime(v) {
            this.timeShow = false;
            v.forEach(e => {
                this.newFormData.startDate = v[0];
                this.newFormData.endDate = v[v.lenght - 1];
                this.timeDataStr = v[0] + ' 至 ' + v[v.length - 1];
            });
        },

        // 选择合同
        // selectContract() {
        //     if (this.newFormData.customerName != '') {
        //         if (this.newFormData.contractOrders != []) {
        //             uni.showToast({
        //                 title: '添加订单后，不能修改合同！',
        //                 icon: 'error',
        //                 duration: 2000
        //             });
        //         }
        //         this.selectContractShow = true;
        //     } else {
        //         this.$refs.formRef
        //             .validate()
        //             .then(res => {
        //                 uni.$u.toast('校验成功');
        //             })
        //             .catch(err => {
        //                 uni.$u.toast('请选择结算客户');
        //             });
        //     }
        // },
        // 选择合同类型输入框获取焦点触发
        // searchContractFormTypeFocus() {
        //     // 类型弹出框
        //     this.selectContractTypeShow = true;
        //     // 弹出框类型请求
        //     this.$nextTick(() => {
        //         this.$reqGet('contract_type').then(res => {
        //             res.data.forEach(item => {
        //                 this.selectContractTypeData[0].push(item.value);
        //             });
        //         });
        //     });
        // },
        // 选择合同弹框
        // selectContractOpen() {
        //     uni.showLoading({
        //         title: '加载中...'
        //     });
        //     this.$reqGet('contract_status').then(res => {
        //         // console.log('状态', res);
        //     });
        //     this.$reqGet('contract', this.searchContractForm).then(res => {
        //         uni.hideLoading();
        //         if (res.code == 0) {
        //             // console.log('合同', res);
        //             this.contractData = res.data.records;
        //         }
        //     });
        // },
        // selectContractClose() {
        //     this.selectContractShow = false;
        // },
        // 合同类型选择器
        // selectContractTypeConfirm(v) {
        //     this.searchContractForm.type = v.value[0];
        //     this.selectContractTypeShow = false;
        //     console.log('选择器确定后的值', v, this.searchContractForm.type);
        // },
        // selectContractTypeClose(v) {
        //     // 初始化合同类型选择器
        //     this.selectContractTypeData[0] = [];

        //     this.selectContractTypeShow = false;
        //     if (v) {
        //         this.searchContractForm.type = v.value[0];
        //     }
        // },
        // 合同时间选择器
        // selectContractStartTimeConfirm(e) {
        //     this.selectContractStartTimeShow = false;
        //     this.searchContractForm.startDate = e[0];
        // },
        // selectContractStartTimeClose() {
        //     this.selectContractStartTimeShow = false;
        // },
        // selectContractEndTimeConfirm(e) {
        //     this.selectContractEndTimeShow = false;
        //     this.searchContractForm.endDate = e[0];
        // },
        // selectContractEndTimeClose() {
        //     this.selectContractEndTimeShow = false;
        // },
        // 重置表单所有字段
        // selectContractResetFields() {
        //     this.searchContractForm.num = '';
        //     this.searchContractForm.startDate = '';
        //     this.searchContractForm.endDate = '';
        //     this.searchContractForm.customerName = '';
        //     this.searchContractForm.type = '';
        // },
        // selectContractClick(e) {
        //     console.log('选择合同', e);
        //     this.newFormData.contractName = e.contractName;
        //     this.newFormData.contractNum = e.num;
        //     this.newFormData.contractId = e.id;
        //     this.selectContractShow = false;

        //     // 价格参数赋值
        //     this.getNewPriceData.type = e.type;
        //     // 选定合同详情
        //     uni
        //         .request({
        //             url: `/yunxiao/contractitem/getByContractId/${e.id}`,
        //             method: 'GET',
        //             header: {
        //                 'TENANT-ID': 5,
        //                 Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
        //                 VERSION: 'zzl'
        //             }
        //         })
        //         .then(res => {
        //             this.contractDetails = res[1].data.data;
        //             console.log('合同详情', res, this.contractDetails);
        //         })
        //         .catch(err => {
        //             console.log(err);
        //         });
        // },
        // 添加订单按钮
        addContractClick() {
            // 打印true或false
            this.$refs.formRef
                .validate()
                .then(res => {
                    if (this.accountDetails.balanceType == '贷') {
                        uni.showToast({
                            title: '客户账户余额当前处于欠款状态！',
                            icon: 'error',
                            duration: 2000
                        });
                    } else {
                        if (this.accountDetails.balance == 0 || (null && this.accountDetails.balance2 == 0) || null) {
                            uni.showToast({
                                title: '账户余额不足！',
                                icon: 'error',
                                duration: 2000
                            });
                        } else {
                            this.addContractShow = true;
                            this.addContractFormdata = {
                                amount: null,
                                coalId: null,
                                coalName: '',
                                compId: null,
                                compName: '',
                                cost1: '',
                                cost2: '',
                                customerId: null,
                                customerName: '',
                                edit: true,
                                favouredpolicyIds: '',
                                filedId: null,
                                filedName: '',
                                fromStation: '',
                                modifyId: null,
                                modifyInfoId: null,
                                customerAddressId: null,
                                price: null,
                                priceMode: '0',
                                quant: '',
                                toStation: '',
                                trainType: 1,
                                type: ''
                            };
							
                            // this.getNewPriceData.type = this.newFormData.type;
                            // this.getNewPriceData.customerAddressName = this.addContractFormdata.customerFullName;
                            // this.getNewPriceData.customerAddressId = this.addContractFormdata.id;
                            // this.getNewPriceData.toStation = this.addContractFormdata.toStation;
                            // this.getNewPriceData.coalId = this.addContractFormdata.coalId;
                            // this.getNewPriceData.coalName =this.addContractFormdata.coalName;
                            // 获取合同煤种价格
                            // this.getNewPrice();
							
                            // 运输类型初始化
                            switch(this.addContractFormdata.trainType){
                                case 1:
                                this.addContractTransport = '地销';
                                break;
                                case 2:
                                this.addContractTransport = '路运';
                                break;
                            }
							
                            // 获取合同详情，煤种
                            this.getContractDetails();
							
                            // console.log('this.addContractFormdata',this.addContractFormdata);
                            this.multipleSelection = [];
                        }
                    }
                })
                .catch(err => {
                    uni.$u.toast('效验失败');
                });
        },
        // 添加合同弹出框
        addContractClose() {
            this.addContractFormdata = {};
            this.addContractShow = false;
        },
        addContractOpen() {
            console.log('添加申请子项窗口打开this.addContractFormdata',this.addContractFormdata);
            // console.log('添加订单打开');
        },
        // 选择煤厂
        coalFiledSelectOpen(e) {
            // console.log('coalfiledSelect: ', e);
        },
        coalFiledSelectClose() {
            this.coalFiledSelectShow = false;
        },
        // 选择的煤厂
        coalFiledSelectClick(e) {
            this.addContractFormdata.compName = e.compName;
            this.addContractFormdata.filedName = e.name;
            this.addContractFormdata.compId = e.compId;
            this.addContractFormdata.filedId = e.id;
            this.addContractFormdata.fromStation = e.toStation;

            this.selectCoalFiledData = e;

            this.coalFiledSelectShow = false;
        },
        // 收货人
        addContractConsigneeClose() {
            this.addContractConsigneeShow = false;
        },
        // 添加合同子项收货人打开
        addContractConsigneeOpen() {
            this.selectCustomer()
        },
        addContractConsignee() {
            this.addContractConsigneeShow = true;
        },
        addContractConsigneeConfirm(v) {
            // console.log('收货人', v);
            this.addContractFormdata.toStation = v.toStation;
            this.addContractFormdata.customerName = v.customerName;
            this.addContractFormdata.customerId = v.id;
            this.$reqGet('getAccount', { customerId: v.id }).then(res => {
                // console.log('获取收货人账号', res);
                // this.accountDetails = res.data;
                // this.newFormData.customerName = res.data.customerName;
                // this.newFormData.customerId = res.data.id;
                // this.searchContractForm.customerName = res.data.customerName;
            });
            this.$nextTick(() => {
                this.addContractConsigneeShow = false;
            });

            // 赋值给取价格请求参数
            this.getNewPriceData.customerAddressName = v.customerFullName;
            this.getNewPriceData.customerAddressId = v.id;
            this.getNewPriceData.toStation = v.toStation;

            this.addContractFormdata.toStation = v.toStation;
            this.addContractFormdata.customerAddressId = v.id;

            // 添加煤种选项
            this.contractDetails.forEach(item => {
                let a = [{ label: '', id: '' }];
                a[0].label = item.coalName;
                a[0].id = item.coalId;
                if (this.addContractCoalData[0]) {
                    this.addContractCoalData = [];
                }
                this.addContractCoalData.push(a);
            });
			
        },
        // 品种选择器
        addContractCoalConfirm(e) {
            // console.log('品种选择器', e);

            this.addContractCoalShow = false; // 关闭选择器
            this.addContractFormdata.coalId = e.value[0].id;
            this.addContractFormdata.coalName = e.value[0].label;
            // 煤种价格请求(煤厂=>价格参数)
            this.getNewPriceData.coalId = e.value[0].id;
            this.getNewPriceData.coalName = e.value[0].label;

            // this.selectCoalFiledData.compId = e.compId;
            // this.selectCoalFiledData.compName = e.compName;
            // this.selectCoalFiledData.toStation = e.fromStation;
			
            this.getNewPrice();
        },
        getNewPrice(){
            this.$reqGet('getNewPrice', this.getNewPriceData).then(res => {
                if (res.code == 0) {
                    // console.log('获取价格',res);
                    let data = res.data;
                    if (data) {
                        this.currentCoal.coalName = data.coalName;
                        this.currentCoal.cokingPrice = data.cokingPrice; //焦化价格
                        this.currentCoal.noImportantPrice = data.noImportantPrice; //不重要价格
                        this.currentCoal.quotePrice = data.quotePrice; // 挂牌价格
                        this.currentCoal.steelMillPrice = data.steelMillPrice; // 钢厂价格
                        this.currentCoal.modifyId = data.modifyId; //修改id
                        this.currentCoal.modifyInfoId = data.id;
			
                        this.addContractFormdata.price = data.steelMillPrice;
                        this.addContractFormdata.modifyId = data.modifyId;
                        this.addContractFormdata.id = data.id;
                    } else {
                        uni.$u.toast('煤种价格未设置');
                    }
                }
            });
        },
        addContractCoalClose() {
            this.addContractCoalShow = false;
        },
        // 煤品种价格
        groupChange(e) {
            // console.log('单选框小组', e);
        },
        changePriceMode(e) {
            console.log(e,'e==========')
            console.log(this.currentCoal,'this.currentCoal==========')
            if (!this.currentCoal) return;
            if(e){
                this.addContractFormdata.priceMode = e;
            }
            this.addContractFormdata.price = this.afterPrice.quotePrice;
            console.log(this.addContractFormdata.price,'this.currentCoal.price=====afterPrice333333333333')
            switch (this.addContractFormdata.priceMode) {
                case '0':
                    console.log('价格',this.afterPrice.steelMillPrice);
                    this.addContractFormdata.price = this.currentCoal.steelMillPrice;
                    break;
                case '1':
                    this.addContractFormdata.price = this.currentCoal.cokingPrice;
                    break;
                case '2':
                    this.addContractFormdata.price = this.currentCoal.noImportantPrice;
                    break;
                case '3':
                    this.addContractFormdata.price = this.currentCoal.quotePrice;
                    console.log('进入单选框',this.currentCoal,'this.addContractFormdata===444');
                    break;
            }
        },
        // 优惠选择
        selectionChange(e) {
            // console.log('优惠选择',e);
            this.multipleSelection = [];
            this.favouredpolicyList.forEach((item, i) => {
                if (e.detail.index.indexOf(i) != -1) {
                    this.multipleSelection.push(item);
                }
            });
        },
        // 运输选择器
        addContractTransportConfirm(e) {
            this.addContractTransportShow = false;
            this.addContractFormdata.trainType = e.value[0].value;
            switch (this.addContractFormdata.trainType) {
                case 1:
                    this.addContractTransport = '地销';
                    break;
                case 2:
                    this.addContractTransport = '路运';
                    break;
            }
        },
        addContractTransportClose() {
            this.addContractTransportShow = false;
        },
        // 获取运费
        async getFreight(from, to, customerId) {
            let key = from + to + customerId;
            let price = this.trainfreight[key];
            price = await this.$reqGet('trainFreightFind', { from, to, customerId }).then(res => {
                let resPrice = 10; //默认价格为10
                if (res.data) {
                    resPrice = res.data.price;
                }
                return resPrice;
            });
            return price;
        },
        addContractSanConfirm() {
            if (this.addContractFormdata.compId && this.addContractFormdata.customerId && this.addContractFormdata.filedId) {
                if(this.applicationOrderIndex == null){
                    this.newFormData.contractOrders.push(this.addContractFormdata);
                    this.$nextTick(() => {
                        this.addContractShow = false;
                    });
                    this.$u.toast('添加成功');
                } else {
                    // this.newFormData.contractOrders.map(i => {
                    //     return this.newformData.contractOrders[]
                    // })
                    this.newFormData.contractOrders[this.applicationOrderIndex] = this.addContractFormdata;
                    this.addContractShow = false; // 隐藏弹出框
                    this.applicationOrderIndex = null; // 初始化修改订单index
                    this.$u.toast('修改成功');	
                }
				
				
            } else {
                uni.$u.toast('请规范输入所有信息');
            }
        },
        // 初始数据请求
        operato() {
            this.$reqGet('operator').then(res => {
                this.operator = res.data;
            });
        },
        pay_type() {
            this.actions = [];
            this.$reqGet('pay_type').then(res => {
                // console.log('paytype', res);
                this.payData = res.data;
                res.data.forEach(e => {
                    let a = { name: '', value: '' };
                    a.name = e.label;
                    a.value = e.value;
                    this.actions.push(a);
                });
            });
            // console.log(this.actions);
        },
        // 抑尘费
        others_params() {
            this.$reqGet('others_params').then(res => {
                // console.log('others_params', res);
                res.data.forEach(e => {
                    if (e.label == 'dust') {
                        this.dust = parseFloat(e.value);
                    }
                });
            });
        },
        coalprice() {
            this.$reqGet('coalprice', { current: 1, size: 1000 }).then(res => {
                // console.log('coalprice', res);
            });
        },
        // 级别距优惠
        jcfavouredpolicyitem() {
            this.$reqGet('jcfavouredpolicyitem', { current: 1, size: 1000, status: 0 }).then(res => {
                // console.log('级别距优惠', res);
                // this.favouredpolicyListAll = res.data.records;
            });
        },
        // 获取所有的优惠政策
        getFavouredPolicyItem() {
            this.$reqGet('getFavouredPolicyItem', { current: 1, size: 1000, status: 0 }).then(res => {
                // console.log('所有价格优惠',res.data.records);
                this.favouredpolicyListAll = res.data.records;
            });
        },
        // 煤场
        coalfiled() {
            this.$reqGet('coalfiled', this.coalfiledParams).then(res => {
                this.coalfiledData = res.data.records;
            });
        },
        // 时间
        timeClose() {
            this.timeShow = false;
        },
        menushow(e) {
            this.menuShow = e;
        },
        // 选择客户
        // moveHandleCustomer() {
        //     return true;
        // },
        // moveHandleContract(){
        //     return true;
        // },
        // 新建发运申请
        newApplicationFormDataClick() {
            this.$refs.formRef
                .validate()
                .then(res => {
                    let amount = 0;
                    this.newFormData.contractOrders.forEach(e => {
                        amount += Number(e.amount);
                    });
                    if (this.newFormData.payType == '0') {
                        if(this.newFormData.contractOrders.length <= 0){
                            this.$u.toast('请添加订单子项！');
                            return false;
                        }else if (this.accountDetails.balance < amount) {
                            let msg = this.accountDetails.balance == null ? 0 : this.accountDetails.balance;
                            uni.showToast({
                                title: '客户账户现汇余额不足，现汇余额:' + msg,
                                icon: 'error',
                                duration: 2000
                            });
                        } else {
                            this.editShenQing();
                            // this.xswaybill();
                        }
                    } else {
                        if(this.newFormData.contractOrders.length <= 0){
                            this.$u.toast('请添加订单子项！');
                            return false;
                        }else if (this.accountDetails.balance2 < amount) {
                            let msg = this.accountDetails.balance2 == null ? 0 : this.accountDetails.balance2;
                            uni.showToast({
                                title: '客户账户承兑余额不足，承兑余额:' + msg,
                                icon: 'error',
                                duration: 2000
                            });
                        } else {
                            this.editShenQing();
							
                            // this.xswaybill();
                        }
                    }
                })
                .catch(err => {
                    uni.$u.toast('校验失败');
                });
        },
        // 修改申请信息
        editShenQing(){
            uni.request({
                url:'/yunxiao/xswaybill',
                method:"PUT",
                data:this.newFormData,
                header:{
                    'TENANT-ID': 5,
                    Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
                    VERSION: 'zzl'
                },
				
            }).then(res=>{
                // console.log(res);
                if(res.code == 0){
                    uni.showToast({
                        title:'修改成功',
                        icon:'success',
                        duration:2000
                    })
                    this.$u.toast('修改成功')
                }
                uni.navigateBack({
                        delta: 1
                    });
            })
        },
        // 删除订单卡片
        deleteContractCardClick(e) {
            // console.log('删除订单卡片', e);
            this.newFormData.contractOrders.splice(e, 1);
        },
        xswaybill() {
            uni.showLoading({
                title: '加载中...'
            });
            this.$reqPost('xswaybill', this.newFormData).then(res => {
                uni.hideLoading();
                if (res.code == 0) {
                    uni.showToast({
                        title: '添加成功！',
                        icon: 'success',
                        duration: 2000
                    });
                    // this.$nextTick(() => {
                    //     uni.navigateBack({
                    //         // url: '/pages/my-application/my-application'
                    //         delta: 2
                    //     });
                    // });
                }
            });
        },
        backPage() {
            uni.navigateBack({
                delta: 1
            });
        }
    }
>>>>>>> Stashed changes
};
</script>


 pages/home/home.vue

@@ -691,9 +691,12 @@
                justify-content: center;
                align-content: center;
                margin-right: vww(10);
<<<<<<< Updated upstream
                &:nth-last-child(1) {
                    margin-right: 0;
                }
=======
>>>>>>> Stashed changes
                view {
                    display: inline-block;
                }

 project.config.json

New file
@@ -0,0 +1,30 @@
{
  "miniprogramRoot": "unpackage/dist/dev/mp-weixin/",
  "appid": "wx7bcc7aa2be8a2a6d",
  "compileType": "miniprogram",
  "libVersion": "2.25.2",
  "packOptions": {
    "ignore": [],
    "include": []
  },
  "setting": {
    "coverView": true,
    "es6": true,
    "postcss": true,
    "minified": true,
    "enhance": true,
    "showShadowRootInWxmlPanel": true,
    "packNpmRelationList": [],
    "babelSetting": {
      "ignore": [],
      "disablePlugins": [],
      "outputPath": ""
    }
  },
  "condition": {},
  "editorSetting": {
    "tabIndent": "insertSpaces",
    "tabSize": 2
  },
  "srcMiniprogramRoot": "unpackage/dist/dev/mp-weixin/"
}

 project.private.config.json

New file
@@ -0,0 +1,20 @@
{
  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "projectname": "group-app",
  "setting": {
    "compileHotReLoad": true
  },
  "condition": {
    "miniprogram": {
      "list": [
        {
          "name": "",
          "pathName": "/pages/login/login",
          "query": "",
          "launchMode": "default",
          "scene": null
        }
      ]
    }
  }
}