|
|
@@ -210,6 +210,7 @@
|
|
|
<el-table-column label="审核人" align="center" prop="companyAuditUserName" />
|
|
|
<!-- <el-table-column label="总后台审核时间" align="center" prop="adminAuditTime" />
|
|
|
<el-table-column label="总后台审核人" align="center" prop="adminAuditUserName" /> -->
|
|
|
+ <el-table-column label="备注" align="center" prop="mark" show-overflow-tooltip />
|
|
|
<el-table-column label="被拒原因" align="center" prop="reason" show-overflow-tooltip />
|
|
|
<!-- <el-table-column label="提交时间" align="center" prop="createTime" /> -->
|
|
|
<el-table-column label="创建时间" align="center" prop="orderCreateTime" width="160"/>
|
|
|
@@ -229,6 +230,12 @@
|
|
|
v-hasPermi="['store:storeOrderAudit:audit']"
|
|
|
>审核订单</el-button>
|
|
|
</el-popover>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ @click="handleDetails(scope.row)"
|
|
|
+ v-hasPermi="['store:storeOrder:query']"
|
|
|
+ >订单详情</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -271,15 +278,20 @@
|
|
|
v-hasPermi="['store:storeOrderAudit:auditBatch']">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <el-drawer size="75%" :title="show.title" :visible.sync="show.open">
|
|
|
+ <product-order ref="order" />
|
|
|
+ </el-drawer>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { getCompanyList } from "@/api/company/company";
|
|
|
import {list, audit,auditBatch} from "@/api/hisStore/storeOrderAudit";
|
|
|
+import productOrder from "../components/productOrder";
|
|
|
|
|
|
export default {
|
|
|
name: "StoreOrderAudit",
|
|
|
+ components: { productOrder},
|
|
|
data() {
|
|
|
const statusOptions = [
|
|
|
{
|
|
|
@@ -300,7 +312,11 @@ export default {
|
|
|
]
|
|
|
|
|
|
return {
|
|
|
-
|
|
|
+ // 订单详情
|
|
|
+ show:{
|
|
|
+ open:false,
|
|
|
+ title:"订单详情"
|
|
|
+ },
|
|
|
tableKey: 0,
|
|
|
showSearch: true,
|
|
|
companys: [],
|
|
|
@@ -357,6 +373,14 @@ export default {
|
|
|
this.tableKey = Date.now()
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 订单详情
|
|
|
+ handleDetails(row){
|
|
|
+ this.show.open=true;
|
|
|
+ const orderId = row.orderId ;
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$refs.order.getOrder(orderId);
|
|
|
+ }, 500);
|
|
|
+ },
|
|
|
// 确认批量审核
|
|
|
confirmBatchAudit() {
|
|
|
// 这里需要调用批量审核接口,假设有一个批量审核的API
|