From 8b2b4dbf15d2e2acd750f349310429d4e346daa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 6 Jun 2023 17:41:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogCreateOrder.vue | 30 +++------------------------
src/views/inout/IoCreateOrder.vue | 1 -
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f9d48d0..ceeae63 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -59,7 +59,7 @@
@change="actionChange">
<el-option
v-for="item in busTypeOptions"
- :key="item.name"
+ :key="item.action"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
@@ -405,6 +405,7 @@ export default {
},
initBusType() {
+ debugger
let query = {
code: this.orderFormData.invCode,
};
@@ -877,7 +878,6 @@ export default {
inputer.focus();
},
created() {
-
//页面初始化
this.codeFormData.code = '';
@@ -898,7 +898,7 @@ export default {
this.orderFormData = this.orderQuery;
this.actionEnable = true;
this.refreshCodesPanel();
- //加载选择框候选数据
+ // //加载选择框候选数据
this.findInvListByUser();
this.initBusType();
this.findMethod(this.orderFormData.fromCorp);
@@ -931,31 +931,7 @@ export default {
<style>
-#inputer {
- width: 100%;
- min-height: 30px;
- background-color: white;
- border: #d0d0d0;
- border-style: solid;
- border-width: 0.1px;
- color: #4a4a4a;
-
-}
-
-#inputer:focus {
- width: 100%;
- min-height: 30px;
- background-color: white;
- border: #0080FF;
- border-style: solid;
- border-width: 0.1px;
- color: #4a4a4a;
-
-}
-.ime-disabled {
- ime-mode: disabled;
-}
</style>
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 02d04ca..24de6ca 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -401,7 +401,6 @@ export default {
},
closeDialog() {
this.addOrderVisible = false;
- this.addHosOrderVisible = false;
this.getList();
},
From 6ee57130ea57a043e85d9c6293c90f947e55b0ed Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 7 Jun 2023 17:15:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B7=BB=E5=8A=A0=20?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/business/stockOrder.vue | 20 ++++++++++++--
src/views/inout/InvoiceRegistration.vue | 25 +++++++++++++++---
src/views/inout/IoCheckErrorOrder.vue | 20 ++++++++++++--
src/views/inout/IoCreateBusOrder.vue | 20 ++++++++++++--
src/views/inout/IoCreateOrder.vue | 18 +++++++++++--
src/views/inout/IoCreateScanOrder.vue | 19 ++++++++++++--
src/views/inout/IoDealOrder.vue | 18 ++++++++++++-
src/views/inout/IoDeliveryAuditOrder.vue | 26 ++++++++++++++++---
src/views/inout/IoDeliverySearchOrder.vue | 25 +++++++++++++++---
src/views/inout/IoReturnedSearchOrder.vue | 25 +++++++++++++++---
src/views/inout/IoSupAduitOrder.vue | 21 +++++++++++++--
src/views/inout/IoSupSearchOrder.vue | 25 +++++++++++++++---
src/views/inout/IoSupSecAuditOrder.vue | 24 ++++++++++++++---
.../purchase/purOrder/purOrderSearch.vue | 19 ++++++++++++++
14 files changed, 274 insertions(+), 31 deletions(-)
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 7fc3c66..4da495c 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -87,14 +87,18 @@
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
- @row-click="getStockOrderDetailList" ref="multipleTable">
+ @row-click="getStockOrderDetailList" ref="multipleTable"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="120">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+ <el-table-column label="创建时间" prop="createTime" width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="打印状态" width="100" prop="inCodeStatus">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
@@ -207,6 +211,7 @@ export default {
name: "stockOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
convertDateFun: convertDate,
query: {
@@ -387,6 +392,17 @@ export default {
this.getList();
}
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.query.sort = 'desc'
+ } else {
+ this.query.sort = 'asc'
+ }
+ this.query.orderBy = column.prop;
+ this.getList();
+ },
+
getList() {
this.loading = true;
this.query.corpId = store.getters.customerId;
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 0f2b529..648af73 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -138,7 +138,9 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @row-click="handleSelectionChange">
+ @row-click="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="登记状态" prop="checkStatus" width="100">
<template slot-scope="scope">
@@ -160,9 +162,13 @@
</el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
</el-table-column>
- <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
+ <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
@@ -545,6 +551,7 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
savebillno: null,
invoiceRow: [],
inputInv: [],
@@ -869,6 +876,18 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index d1d4f80..6484f0d 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -99,12 +99,16 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @cell-click="handleSelectionChange">
+ @cell-click="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@@ -459,6 +463,7 @@ export default {
name: "IoCheckErrorOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@@ -682,6 +687,17 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 9792cfc..bba95b3 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -109,12 +109,15 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
- border
+ border :default-sort="defaultSort"
+ @sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -235,6 +238,7 @@ export default {
name: "IoCreateBusOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
titleMap: {
add: "新增单据",
@@ -411,6 +415,18 @@ export default {
this.getList();
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 24de6ca..dd39b46 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -99,13 +99,16 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
- border
+ border :default-sort="defaultSort"
+ @sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@@ -223,6 +226,7 @@ export default {
name: "IoDealOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@@ -404,6 +408,16 @@ export default {
this.getList();
},
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index a39b6ee..ac2e9b0 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -99,13 +99,16 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
- border
+ border :default-sort="defaultSort"
+ @sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -196,6 +199,7 @@ export default {
name: "IoCreateScanOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
titleMap: {
add: "新增单据",
@@ -367,6 +371,17 @@ export default {
this.getList();
},
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e08246f..e3a29d3 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -101,12 +101,16 @@
highlight-current-row
@row-click="handleSelectionChange"
border
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@@ -337,6 +341,7 @@ export default {
name: "IoDealOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@@ -525,6 +530,17 @@ export default {
this.getList();
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index 1333fa6..ca4bddc 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -135,19 +135,25 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
+ <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
<!--</template>-->
</el-table-column>
- <el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150">
+ <el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
@@ -602,6 +608,7 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
imgList:[],
imgListCold:[],
imgViewerVisible:false,
@@ -963,6 +970,19 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 10bc661..78cd29c 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -152,20 +152,26 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
+ <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
- <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
+ <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
@@ -626,6 +632,7 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
imgViewerVisible:false,
imgViewerVisibleCold:false,
imgList:[],
@@ -958,6 +965,18 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 894685e..340a07b 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -139,20 +139,26 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
+ <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
- <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
+ <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@@ -524,6 +530,7 @@ export default {
name: "IoReturnedSearchOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@@ -796,6 +803,18 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index bec4ae2..8d5af76 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -99,11 +99,15 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -452,6 +456,7 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgList:[],
imgListCold:[],
@@ -716,6 +721,18 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 9ac8369..e4ec3bc 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -129,13 +129,19 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
- <el-table-column label="审核时间" prop="checkTime" width="140" show-overflow-tooltip>
+ <el-table-column label="审核时间" prop="checkTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -508,6 +514,7 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible: false,
imgViewerVisibleCold: false,
@@ -802,6 +809,18 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 7e4d325..3ad10ef 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -113,13 +113,19 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @current-change="handleSelectionChange">
+ @current-change="handleSelectionChange"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
- <el-table-column label="核对时间" prop="checkTime" width="140" show-overflow-tooltip>
+ <el-table-column label="核对时间" prop="checkTime" width="140" show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']" >
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -487,6 +493,7 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgList: [],
imgListCold:[],
@@ -762,6 +769,17 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index e115b72..babf809 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -151,6 +151,8 @@
border
highlight-current-row="true"
@current-change="handleDetail"
+ :default-sort="defaultSort"
+ @sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
@@ -164,6 +166,8 @@
prop="auditTime"
width="150"
show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column
label="供应商"
@@ -193,6 +197,8 @@
prop="arrivalTime"
width="150"
show-overflow-tooltip
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column
label="订单说明"
@@ -286,6 +292,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
export default {
data() {
return {
+ defaultSort: {prop: 'auditTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
filterQuery: {
billAction: null,
@@ -461,6 +468,18 @@ export default {
"/udiwms/image/register/file/getImage?type=image2&name=";
window.open(this.certFileUrl + this.filePath);
},
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+
getList() {
if (this.auditTimes != null) {
this.filterQuery.startAuditDate = this.auditTimes[0];
From 3cc66c41e0bdff175ec116f8093e1e95aca8b00b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 8 Jun 2023 10:13:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/InvoiceCkeck.vue | 3 ++-
src/views/inout/InvoiceRegistration.vue | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 3b1696f..f80a34f 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -294,7 +294,7 @@ export default {
required: true,
},
getOrderDetails: {
- type: Object,
+ type: Function,
required: true,
},
invoiceRow: {
@@ -519,6 +519,7 @@ export default {
.then((response) => {
if (response.code === 20000) {
this.statusCode = response.code;
+ this.getOrderDetails();
} else {
this.$message.error(response.message);
}
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 648af73..f5875fe 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -460,6 +460,7 @@
<checkInvoice
:closeDialog="closecheckInvoice"
:input="inputInv"
+ :getOrderDetails="getOrderDetails"
></checkInvoice>
</el-dialog>
@@ -835,6 +836,9 @@ export default {
deleteById(row)
.then((response) => {
if (response.code == 20000) {
+ if(response.data.length == 0){
+ this.getList();
+ }
this.getBizDetailListInv(this.subRow);
this.$message({
type: "success",
@@ -1015,7 +1019,7 @@ export default {
}
this.codeQuery.orderIdFk = this.currentRow.billNo;
this.codeDetailLoading = true;
-
+ this.codeDetailList=[];
filterBizOrderList(this.codeQuery).then((res) => {
this.codeDetailLoading = false;
if (res.code === 20000) {
From c15b0baa621fef3cd9debb9589eadfd1bcfb878b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 8 Jun 2023 10:24:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/InvoiceRegistration.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index f5875fe..66f2c8a 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -138,7 +138,7 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
- @row-click="handleSelectionChange"
+ @current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
@@ -229,7 +229,7 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
- @row-click="BizDetail"
+ @current-change="BizDetail"
row-key="id" highlight-current-row
>
<el-table-column label="序号" type="index"></el-table-column>