*

lsh

13 小时以前 f52c5b4a8ecf1279cc7a580f2bffcbd0b75fe5fa

*

 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -121,6 +121,16 @@
                        @keyup.enter.native="handleSearch"
                ></el-input>
            </div>
<!--            <div class="search-item">-->
<!--                <span class="search-label">订单编号:</span>-->
<!--                <el-input-->
<!--                        v-model="searchForm.orderNo"-->
<!--                        placeholder="请输入订单编号"-->
<!--                        clearable-->
<!--                        style="width: 150px;"-->
<!--                        @keyup.enter.native="handleSearch"-->
<!--                ></el-input>-->
<!--            </div>-->
            <div class="search-item">
                <span class="search-label">状态:</span>
                <el-select
@@ -130,19 +140,20 @@
                        style="width: 150px;"
                >
                    <el-option label="全部" value=""></el-option>
                    <el-option label="正常" value="1"></el-option>
                    <el-option label="禁用" value="0"></el-option>
                    <el-option label="待处理" value="1"></el-option>
                    <el-option label="作业中" value="2"></el-option>
                    <el-option label="已取消" value="3"></el-option>
                    <el-option label="已完成" value="4"></el-option>
                    <el-option label="准备取消" value="5"></el-option>
                    <el-option label="已完成" value="6"></el-option>
                    <el-option label="上报完成" value="7"></el-option>
                    <el-option label="待判查询中" value="9"></el-option>
                    <el-option label="就绪" value="10"></el-option>
                    <el-option label="生成实际组货单中。请等待..." value="11"></el-option>
                    <el-option label="生成实际组货单成功" value="12"></el-option>
                    <el-option label="生成实际组货单失败" value="13"></el-option>
                    <el-option label="异常" value="99"></el-option>
                </el-select>
            </div>
            <div class="search-item">
                <span class="search-label">订单编号:</span>
                <el-input
                        v-model="searchForm.orderNo"
                        placeholder="请输入订单编号"
                        clearable
                        style="width: 150px;"
                        @keyup.enter.native="handleSearch"
                ></el-input>
            </div>
            <div class="search-actions">
                <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
@@ -165,8 +176,8 @@
            <el-table-column prop="orderNo" label="订单编号" min-width="140" align="center"></el-table-column>
            <el-table-column prop="cstmrName" label="客户名称" min-width="120" align="center"></el-table-column>
            <el-table-column prop="settle" label="状态" min-width="100" align="center" :formatter="formatStatus"></el-table-column>
            <el-table-column prop="totalFee" label="合计金额" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>
            <el-table-column prop="createTime" label="创建时间" min-width="140" align="center" sortable="custom"></el-table-column>
<!--            <el-table-column prop="totalFee" label="合计金额" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>-->
<!--            <el-table-column prop="createTime" label="创建时间" min-width="140" align="center" sortable="custom"></el-table-column>-->
            <el-table-column label="操作" width="150" align="center" fixed="right">
                <template slot-scope="scope">
                    <div class="operation-cell">
@@ -207,7 +218,7 @@
            <el-descriptions :column="2" border>
                <el-descriptions-item label="订单编号">{{ currentRow.orderNo }}</el-descriptions-item>
                <el-descriptions-item label="客户名称">{{ currentRow.cstmrName }}</el-descriptions-item>
                <el-descriptions-item label="状态">{{ formatStatus(currentRow) }}</el-descriptions-item>
                <el-descriptions-item label="状态">{{ currentRow.settle$ }}</el-descriptions-item>
                <el-descriptions-item label="合计金额">{{ formatCurrency(currentRow) }}</el-descriptions-item>
                <el-descriptions-item label="创建时间">{{ formatDate(currentRow.createTime) }}</el-descriptions-item>
                <el-descriptions-item label="备注">{{ currentRow.memo || '无' }}</el-descriptions-item>
@@ -259,9 +270,9 @@
            // 搜索表单
            searchForm: {
                uuid: '',
                cstmrName: '',
                cstmr_name: '',
                settle: '',
                orderNo: ''
                order_no: ''
            },
            // 排序相关
            orderByField: '',
@@ -319,7 +330,15 @@
                // 添加搜索参数
                Object.keys(that.searchForm).forEach(key => {
                    if (that.searchForm[key] !== '') {
                        params[key] = that.searchForm[key];
                        if (key === 'orderNo'){
                            params['order_no'] = that.searchForm[key];
                        } else if (key === 'cstmrName'){
                            params['cstmr_name'] = that.searchForm[key];
                        } else if (key === 'settle$'){
                            params['settle'] = that.searchForm[key];
                        } else {
                            params[key] = that.searchForm[key];
                        }
                    }
                });

@@ -496,9 +515,9 @@
            handleReset() {
                this.searchForm = {
                    uuid: '',
                    cstmrName: '',
                    cstmr_name: '',
                    settle: '',
                    orderNo: ''
                    order_no: ''
                };
                this.orderByField = '';
                this.orderByType = 'asc';
@@ -558,6 +577,12 @@
                    return '正常';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                } else {
                    return row.settle || '未知';
                }