|
|
@@ -4,447 +4,269 @@
|
|
|
<!-- <el-select v-model="storeId" size="small" clearable filterable placeholder="店铺" @change="searchData" style="width:120px">
|
|
|
<el-option v-for="item in storeInfos" :key="item.id" :label="item.storeName" :value="item.id"></el-option>
|
|
|
</el-select>-->
|
|
|
- <el-select
|
|
|
- v-model="userId"
|
|
|
- size="small"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="用户"
|
|
|
- @change="searchData"
|
|
|
- style="width:120px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in userInfos"
|
|
|
- :key="item.id"
|
|
|
- :label="item.nickname"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="userId" size="small" clearable filterable
|
|
|
+ placeholder="用户" @change="searchData" style="width:120px">
|
|
|
+ <el-option v-for="item in userInfos" :key="item.id"
|
|
|
+ :label="item.nickname" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select
|
|
|
- v-model="payModeKey"
|
|
|
- size="small"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="支付方式"
|
|
|
- @change="searchData"
|
|
|
- style="width:120px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in payModeOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="payModeKey" size="small" clearable filterable
|
|
|
+ placeholder="支付方式" @change="searchData" style="width:120px">
|
|
|
+ <el-option v-for="item in payModeOptions" :key="item.value"
|
|
|
+ :label="item.label" :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select
|
|
|
- v-model="typeFlagKey"
|
|
|
- size="small"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="订单类型"
|
|
|
- @change="searchData"
|
|
|
- style="width:120px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in typeFlagOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="typeFlagKey" size="small" clearable filterable
|
|
|
+ placeholder="订单类型" @change="searchData" style="width:120px">
|
|
|
+ <el-option v-for="item in typeFlagOptions" :key="item.value"
|
|
|
+ :label="item.label" :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select
|
|
|
- v-model="orderStatusKey"
|
|
|
- size="small"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="订单状态"
|
|
|
- @change="searchData"
|
|
|
- style="width:120px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in orderStatusOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="orderStatusKey" size="small" clearable
|
|
|
+ filterable placeholder="订单状态" @change="searchData"
|
|
|
+ style="width:120px">
|
|
|
+ <el-option v-for="item in orderStatusOptions" :key="item.value"
|
|
|
+ :label="item.label" :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
|
|
|
- <el-input
|
|
|
- placeholder="关键字"
|
|
|
- size="small"
|
|
|
- v-model="filter1"
|
|
|
- clearable
|
|
|
- class="filter-item"
|
|
|
- ></el-input>
|
|
|
- <el-button
|
|
|
- @click="searchData"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-search"
|
|
|
- class="filter-item"
|
|
|
- >搜索</el-button>
|
|
|
+ <el-input placeholder="关键字" size="small" v-model="filter1" clearable
|
|
|
+ class="filter-item"></el-input>
|
|
|
+ <el-button @click="searchData" type="primary" size="small"
|
|
|
+ icon="el-icon-search" class="filter-item">搜索</el-button>
|
|
|
<el-button
|
|
|
@click="showAdvancedQueryDialog = !showAdvancedQueryDialog"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-search"
|
|
|
- class="filter-item"
|
|
|
- >高级查询</el-button>
|
|
|
- <el-button
|
|
|
- @click="showTableSortDialog = !showTableSortDialog"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-sort"
|
|
|
- class="filter-item"
|
|
|
- >排序</el-button>
|
|
|
+ type="primary" size="small" icon="el-icon-search"
|
|
|
+ class="filter-item">高级查询</el-button>
|
|
|
+ <el-button @click="showTableSortDialog = !showTableSortDialog"
|
|
|
+ type="primary" size="small" icon="el-icon-sort"
|
|
|
+ class="filter-item">排序</el-button>
|
|
|
<el-button
|
|
|
@click="$router.push({path:'/userOrderDetail',query:{column:$route.query.column}})"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-edit"
|
|
|
- class="filter-item"
|
|
|
- >添加</el-button>
|
|
|
- <el-button
|
|
|
- @click="exportExcel"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-share"
|
|
|
- class="filter-item"
|
|
|
- >导出EXCEL</el-button>
|
|
|
- <el-dropdown trigger="click" size="medium" class="table-column-filter">
|
|
|
+ type="primary" size="small" icon="el-icon-edit"
|
|
|
+ class="filter-item">添加</el-button>
|
|
|
+ <el-button @click="exportExcel" type="primary" size="small"
|
|
|
+ icon="el-icon-share" class="filter-item">导出EXCEL</el-button>
|
|
|
+ <el-dropdown trigger="click" size="medium"
|
|
|
+ class="table-column-filter">
|
|
|
<span>
|
|
|
筛选数据
|
|
|
<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</span>
|
|
|
- <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
|
|
|
- <el-checkbox
|
|
|
- v-for="item in tableColumns"
|
|
|
- :key="item.value"
|
|
|
- v-model="item.show"
|
|
|
- >{{item.label}}</el-checkbox>
|
|
|
+ <el-dropdown-menu slot="dropdown"
|
|
|
+ class="table-column-filter-wrapper">
|
|
|
+ <el-checkbox v-for="item in tableColumns" :key="item.value"
|
|
|
+ v-model="item.show">{{item.label}}</el-checkbox>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</div>
|
|
|
- <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
|
|
|
- <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
|
|
|
- <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="50"></el-table-column>
|
|
|
+ <el-table :data="tableData" :height="tableHeight" row-key="id"
|
|
|
+ ref="table">
|
|
|
+ <el-table-column v-if="multipleMode" align="center" type="selection"
|
|
|
+ width="50"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('id')" prop="id" label="ID"
|
|
|
+ min-width="50"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('statusFlag')"
|
|
|
- prop="statusFlag"
|
|
|
- :formatter="StatusFlagFormatter"
|
|
|
- label="状态"
|
|
|
- min-width="80"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag"
|
|
|
+ :formatter="StatusFlagFormatter" label="状态" min-width="80">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="70"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('userId')" prop="userId"
|
|
|
+ label="用户" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('orderCode')"
|
|
|
- prop="orderCode"
|
|
|
- label="订单号"
|
|
|
- min-width="150"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('orderCode')" prop="orderCode"
|
|
|
+ label="订单号" min-width="150"></el-table-column>
|
|
|
|
|
|
- <el-table-column prop="storeId" label="店铺" min-width="70" v-if="!storeLogin"></el-table-column>
|
|
|
+ <el-table-column prop="storeId" label="店铺" min-width="70"
|
|
|
+ v-if="!storeLogin"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('typeFlag')"
|
|
|
- prop="typeFlag"
|
|
|
- :formatter="TypeFlagFormatter"
|
|
|
- label="类型"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag"
|
|
|
+ :formatter="TypeFlagFormatter" label="类型" min-width="70">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('productId')"
|
|
|
- prop="productId"
|
|
|
- label="商品"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('productId')" prop="productId"
|
|
|
+ label="商品" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('productName')"
|
|
|
- prop="productName"
|
|
|
- label="商品名"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('productName')"
|
|
|
+ prop="productName" label="商品名" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('quantity')"
|
|
|
- prop="quantity"
|
|
|
- label="数量"
|
|
|
- min-width="50"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('quantity')" prop="quantity"
|
|
|
+ label="数量" min-width="50"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('totalPrice')"
|
|
|
- prop="totalPrice"
|
|
|
- label="总价格"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('totalPrice')" prop="totalPrice"
|
|
|
+ label="总价格" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('dealPrice')"
|
|
|
- prop="dealPrice"
|
|
|
- label="支付价格"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('dealPrice')" prop="dealPrice"
|
|
|
+ label="支付价格" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('payMode')"
|
|
|
- prop="payMode"
|
|
|
- :formatter="PayModeFormatter"
|
|
|
- label="支付方式"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('payMode')" prop="payMode"
|
|
|
+ :formatter="PayModeFormatter" label="支付方式" min-width="70">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('useType')"
|
|
|
- prop="useType"
|
|
|
- label="消费方式"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('useType')" prop="useType"
|
|
|
+ label="消费方式" min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('bookPhotoTime')"
|
|
|
- prop="bookPhotoTime"
|
|
|
- label="预约拍照时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('bookPhotoTime')"
|
|
|
+ prop="bookPhotoTime" label="预约拍照时间"
|
|
|
+ :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('photoTime')"
|
|
|
- prop="photoTime"
|
|
|
- label="拍照时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('photoTime')" prop="photoTime"
|
|
|
+ label="拍照时间" :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('bookSelectTime')"
|
|
|
- prop="bookSelectTime"
|
|
|
- label="预约选片时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('bookSelectTime')"
|
|
|
+ prop="bookSelectTime" label="预约选片时间"
|
|
|
+ :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('selectTime')"
|
|
|
- prop="selectTime"
|
|
|
- label="选片时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('selectTime')" prop="selectTime"
|
|
|
+ label="选片时间" :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('bookCheckTime')"
|
|
|
- prop="bookCheckTime"
|
|
|
- label="预约审片时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('bookCheckTime')"
|
|
|
+ prop="bookCheckTime" label="预约审片时间"
|
|
|
+ :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('checkTime')"
|
|
|
- prop="checkTime"
|
|
|
- label="审片时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('checkTime')" prop="checkTime"
|
|
|
+ label="审片时间" :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('bookAccessTime')"
|
|
|
- prop="bookAccessTime"
|
|
|
- label="预约取件时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('bookAccessTime')"
|
|
|
+ prop="bookAccessTime" label="预约取件时间"
|
|
|
+ :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('accessTime')"
|
|
|
- prop="accessTime"
|
|
|
- label="取件时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('accessTime')" prop="accessTime"
|
|
|
+ label="取件时间" :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('commentTime')"
|
|
|
- prop="commentTime"
|
|
|
- label="评论时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('commentTime')"
|
|
|
+ prop="commentTime" label="评论时间" :formatter="DateTimeFormatter"
|
|
|
+ min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('downPayment')"
|
|
|
- prop="downPayment"
|
|
|
- label="定金"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('downPayment')"
|
|
|
+ prop="downPayment" label="定金" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('unitPrice')"
|
|
|
- prop="unitPrice"
|
|
|
- label="单价"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('unitPrice')" prop="unitPrice"
|
|
|
+ label="单价" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('offPrice')"
|
|
|
- prop="offPrice"
|
|
|
- label="减价格"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('offPrice')" prop="offPrice"
|
|
|
+ label="减价格" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('couponPrice')"
|
|
|
- prop="couponPrice"
|
|
|
- label="优惠价格"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('couponPrice')"
|
|
|
+ prop="couponPrice" label="优惠价格" min-width="70">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('payTime')"
|
|
|
- prop="payTime"
|
|
|
- label="支付时间"
|
|
|
- :formatter="DateTimeFormatter"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('message')"
|
|
|
- prop="message"
|
|
|
- label="留言"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('payTime')" prop="payTime"
|
|
|
+ label="支付时间" :formatter="DateTimeFormatter" min-width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('message')" prop="message"
|
|
|
+ label="留言" min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('remark')" prop="remark"
|
|
|
+ label="备注" min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('showFlag')"
|
|
|
- prop="showFlag"
|
|
|
- label="前端显示"
|
|
|
- min-width="50"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('showFlag')" prop="showFlag"
|
|
|
+ label="前端显示" min-width="50"></el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('fee')" prop="fee" label="手续费" min-width="50"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('fee')" prop="fee" label="手续费"
|
|
|
+ min-width="50"></el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('coin')" prop="coin" label="余额" min-width="70"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('coin')" prop="coin" label="余额"
|
|
|
+ min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('point')" prop="point" label="积分" min-width="70"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('point')" prop="point"
|
|
|
+ label="积分" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column v-if="isColumnShow('cash')" prop="cash" label="现金" min-width="70"></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('cash')" prop="cash" label="现金"
|
|
|
+ min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('userAddressId')"
|
|
|
- prop="userAddressId"
|
|
|
- label="地址Id"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('userAddressId')"
|
|
|
+ prop="userAddressId" label="地址Id" min-width="70">
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('serviceId')"
|
|
|
- prop="serviceId"
|
|
|
- label="店铺服务"
|
|
|
- min-width="70"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('serviceId')" prop="serviceId"
|
|
|
+ label="店铺服务" min-width="70"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('orderId')"
|
|
|
- prop="orderId"
|
|
|
- label="订单Id"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('orderId')" prop="orderId"
|
|
|
+ label="订单Id" min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- v-if="isColumnShow('tailMoney')"
|
|
|
- prop="tailMoney"
|
|
|
- label="尾款"
|
|
|
- min-width="100"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column v-if="isColumnShow('tailMoney')" prop="tailMoney"
|
|
|
+ label="尾款" min-width="100"></el-table-column>
|
|
|
|
|
|
- <el-table-column label="操作" align="right" fixed="right" min-width="300">
|
|
|
+ <el-table-column label="操作" align="right" fixed="right"
|
|
|
+ min-width="300">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- v-if="scope.row.tailorFlag=='Y'"
|
|
|
+ <el-button v-if="scope.row.tailorFlag=='Y'"
|
|
|
@click="$router.push({path:'/orderServices',query:{column:scope.row.id+',orderDetailId'}})"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- plain
|
|
|
- >定制服务</el-button>
|
|
|
- <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
|
|
|
+ type="primary" size="small" plain>定制服务</el-button>
|
|
|
+ <el-button @click="editRow(scope.row)" type="primary"
|
|
|
+ size="mini" plain>编辑</el-button>
|
|
|
<!-- <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button> -->
|
|
|
<el-button
|
|
|
v-if="StatusFlagFormatter('','',scope.row.statusFlag)=='预约拍照'"
|
|
|
- size="mini"
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- @click="changeStaute(scope.row.id,scope.row.statusFlag+1)"
|
|
|
- >拍照完成</el-button>
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="changeStaute(scope.row.id,scope.row.statusFlag+1)">
|
|
|
+ 拍照完成</el-button>
|
|
|
<el-button
|
|
|
v-if="(StatusFlagFormatter('','',scope.row.statusFlag)=='拍照完成'||StatusFlagFormatter('','',scope.row.statusFlag)=='预约选片')&&scope.row.albumStatus==OrderAlbumStatus.WAITUPLOAD"
|
|
|
- size="mini"
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- @click="goNext('orderUpload',scope.row.id)"
|
|
|
- >上传选片</el-button>
|
|
|
- <el-button
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goNext('orderUpload',scope.row.id)">上传选片
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
v-if="(StatusFlagFormatter('','',scope.row.statusFlag)=='拍照完成'||StatusFlagFormatter('','',scope.row.statusFlag)=='预约选片')&&scope.row.albumStatus==OrderAlbumStatus.WAITSELECT"
|
|
|
- size="mini"
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- @click="goNext('choosePhoto',scope.row.id)"
|
|
|
- >选择照片</el-button>
|
|
|
- <el-button
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goNext('choosePhoto',scope.row.id)">选择照片
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
v-if="(scope.row.statusFlag==OrderStatus.BOOKCHECK||scope.row.statusFlag==OrderStatus.SELECTOVER)&&scope.row.albumStatus==OrderAlbumStatus.SELECTOVER"
|
|
|
- size="mini"
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- @click="goNext('orderUploadChange',scope.row.id)"
|
|
|
- >上传修图</el-button>
|
|
|
- <el-button
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goNext('orderUploadChange',scope.row.id)">上传修图
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
v-if="(scope.row.statusFlag==OrderStatus.BOOKCHECK||scope.row.statusFlag==OrderStatus.SELECTOVER)&&scope.row.albumStatus==OrderAlbumStatus.WAITACCEPT"
|
|
|
- size="mini"
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- @click="goNext('orderExamine',scope.row.id)"
|
|
|
- >审核照片</el-button>
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goNext('orderExamine',scope.row.id)">审核照片
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ v-if="(scope.row.statusFlag==OrderStatus.BOOKCHECK||scope.row.statusFlag==OrderStatus.SELECTOVER)&&scope.row.albumStatus==OrderAlbumStatus.REWORK"
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goRepaire('orderUploadChange',scope.row)">返修上传
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ v-if="(scope.row.statusFlag==OrderStatus.BOOKCHECK||scope.row.statusFlag==OrderStatus.SELECTOVER)&&scope.row.albumStatus==OrderAlbumStatus.REWORKACCEPT"
|
|
|
+ size="mini" type="success" plain
|
|
|
+ @click="goExamine('orderExamine',scope.row)">返修审核
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="pagination-wrapper">
|
|
|
<div class="multiple-mode-wrapper" v-if="0">
|
|
|
- <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
|
|
|
+ <el-button size="small" v-if="!multipleMode"
|
|
|
+ @click="toggleMultipleMode(true)">批量编辑</el-button>
|
|
|
<el-button-group v-else>
|
|
|
- <el-button size="small" @click="operation1">批量操作1</el-button>
|
|
|
- <el-button size="small" @click="operation2">批量操作2</el-button>
|
|
|
- <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
|
|
|
+ <el-button size="small" @click="operation1">批量操作1
|
|
|
+ </el-button>
|
|
|
+ <el-button size="small" @click="operation2">批量操作2
|
|
|
+ </el-button>
|
|
|
+ <el-button size="small" @click="toggleMultipleMode(false)">
|
|
|
+ 取消</el-button>
|
|
|
</el-button-group>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="pageSizeChange"
|
|
|
- @current-change="currentPageChange"
|
|
|
- :current-page="currentPage"
|
|
|
- :page-sizes="[10, 20, 30, 40, 50]"
|
|
|
- :page-size="pageSize"
|
|
|
+ <el-pagination background @size-change="pageSizeChange"
|
|
|
+ @current-change="currentPageChange" :current-page="currentPage"
|
|
|
+ :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="totalNumber"
|
|
|
- ></el-pagination>
|
|
|
+ :total="totalNumber"></el-pagination>
|
|
|
</div>
|
|
|
<el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
|
|
|
- <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
|
|
|
+ <el-button @click="addField" type="text" icon="el-icon-plus">添加
|
|
|
+ </el-button>
|
|
|
<el-table :data="advancedQueryFields">
|
|
|
<el-table-column prop="link" label="链接符" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
- <el-select
|
|
|
- placeholder="链接"
|
|
|
- size="small"
|
|
|
- v-model="row.link"
|
|
|
- class="filter-item"
|
|
|
- >
|
|
|
+ <el-select placeholder="链接" size="small"
|
|
|
+ v-model="row.link" class="filter-item">
|
|
|
<el-option label="AND" value="AND"></el-option>
|
|
|
<el-option label="OR" value="OR"></el-option>
|
|
|
</el-select>
|
|
|
@@ -453,24 +275,19 @@
|
|
|
<el-table-column prop="name" label="字段" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-select v-model="row.name">
|
|
|
- <el-option
|
|
|
- v-for="item in advancedQueryColumns"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- :key="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="item in advancedQueryColumns"
|
|
|
+ :label="item.label" :value="item.value"
|
|
|
+ :key="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
|
|
|
+ <el-table-column prop="searchMethod" label="搜索方式" width="150"
|
|
|
+ align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-select v-model="row.searchMethod">
|
|
|
- <el-option
|
|
|
- v-for="item in searchMethods"
|
|
|
- :label="item"
|
|
|
- :value="item"
|
|
|
- :key="item"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="item in searchMethods"
|
|
|
+ :label="item" :value="item" :key="item">
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -481,28 +298,28 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column width="60" align="center">
|
|
|
<template slot-scope="{ row, column, $index }">
|
|
|
- <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
|
|
|
+ <el-button @click="removeField($index)" size="small"
|
|
|
+ type="text">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
|
|
|
+ <el-button @click="advancedQuery"
|
|
|
+ :loading="$store.state.fetchingData">确定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="排序" :visible.sync="showTableSortDialog">
|
|
|
- <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
|
|
|
+ <el-button @click="addSortField" type="text" icon="el-icon-plus">添加
|
|
|
+ </el-button>
|
|
|
<el-table :data="tableSortFields">
|
|
|
<el-table-column prop="name" label="字段" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-select v-model="row.name">
|
|
|
- <el-option
|
|
|
- v-for="item in advancedQueryColumns"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- :key="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="item in advancedQueryColumns"
|
|
|
+ :label="item.label" :value="item.value"
|
|
|
+ :key="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -516,13 +333,15 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column width="60" align="center">
|
|
|
<template slot-scope="{ row, column, $index }">
|
|
|
- <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
|
|
|
+ <el-button @click="removeSortField($index)" size="small"
|
|
|
+ type="text">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
|
|
|
+ <el-button @click="tableSortQuery"
|
|
|
+ :loading="$store.state.fetchingData">确定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -535,7 +354,7 @@
|
|
|
import { mapState } from "vuex";
|
|
|
import { format } from "date-fns";
|
|
|
import zh from "date-fns/locale/zh_cn";
|
|
|
-import {OrderStatus, OrderAlbumStatus } from "../Constants";
|
|
|
+import { OrderStatus, OrderAlbumStatus } from "../Constants";
|
|
|
export default {
|
|
|
name: "UserOrderDetails",
|
|
|
created() {
|
|
|
@@ -999,8 +818,8 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
typeFlagKey: "",
|
|
|
- OrderAlbumStatus:OrderAlbumStatus,
|
|
|
- OrderStatus:OrderStatus
|
|
|
+ OrderAlbumStatus: OrderAlbumStatus,
|
|
|
+ OrderStatus: OrderStatus
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -1260,14 +1079,106 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- goNext(name,id){
|
|
|
- console.log(name)
|
|
|
+ goNext(name, id) {
|
|
|
+ console.log(name);
|
|
|
this.$router.push({
|
|
|
- name:name,
|
|
|
- query:{
|
|
|
- orderId:id
|
|
|
+ name: name,
|
|
|
+ query: {
|
|
|
+ orderId: id
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
+ },
|
|
|
+ goExamine(name, info) {
|
|
|
+ console.log(info);
|
|
|
+ var orderRepairList = info.orderRepairList.filter(item => {
|
|
|
+ return item.statusFlag != 0;
|
|
|
+ });
|
|
|
+
|
|
|
+ var orderAlbumRepairList = info.orderAlbumRepairList.filter(
|
|
|
+ item => {
|
|
|
+ return item.statusFlag != 0;
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+ if (orderAlbumRepairList.length > orderRepairList.length) {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderExamineAlbum",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId:
|
|
|
+ orderAlbumRepairList[
|
|
|
+ orderAlbumRepairList.length - 1
|
|
|
+ ].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else if (orderAlbumRepairList.length < orderRepairList.length) {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderExamine",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId: orderRepairList[orderRepairList.length - 1].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderExamine",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId:
|
|
|
+ orderRepairList[orderRepairList.length - 1].id,
|
|
|
+ AlbumRepairId:
|
|
|
+ orderAlbumRepairList[
|
|
|
+ orderAlbumRepairList.length - 1
|
|
|
+ ].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+ goRepaire(name, info) {
|
|
|
+ console.log(info);
|
|
|
+ var orderRepairList = info.orderRepairList.filter(item => {
|
|
|
+ return item.statusFlag != 0;
|
|
|
+ });
|
|
|
+
|
|
|
+ var orderAlbumRepairList = info.orderAlbumRepairList.filter(
|
|
|
+ item => {
|
|
|
+ return item.statusFlag != 0;
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+ if (orderAlbumRepairList.length > orderRepairList.length) {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderUploadChangeAlbum",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId:
|
|
|
+ orderAlbumRepairList[
|
|
|
+ orderAlbumRepairList.length - 1
|
|
|
+ ].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else if (orderAlbumRepairList.length < orderRepairList.length) {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderUploadChange",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId: orderRepairList[orderRepairList.length - 1].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$router.push({
|
|
|
+ name: "orderUploadChange",
|
|
|
+ query: {
|
|
|
+ orderId: info.id,
|
|
|
+ repairId:
|
|
|
+ orderRepairList[orderRepairList.length - 1].id,
|
|
|
+ AlbumRepairId:
|
|
|
+ orderAlbumRepairList[
|
|
|
+ orderAlbumRepairList.length - 1
|
|
|
+ ].id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|
