Commit 02404779 authored by dragondean@qq.com's avatar dragondean@qq.com

几个bug

parent 7bcc855e
...@@ -784,7 +784,7 @@ export function splitItemUpdate(data){ ...@@ -784,7 +784,7 @@ export function splitItemUpdate(data){
data data
}) })
} }
// 可出订单列表 // 待备货(可出)订单列表
export function canShipmentPage(params){ export function canShipmentPage(params){
return request({ return request({
url: '/air/order/can/shipment/page', url: '/air/order/can/shipment/page',
......
...@@ -464,7 +464,7 @@ export default { ...@@ -464,7 +464,7 @@ export default {
} }
}) })
this.protectRowCount = protectRowCount*/ this.protectRowCount = protectRowCount*/
this.handleAdd() // this.handleAdd()
// this.handleAdd(1) // this.handleAdd(1)
} }
}, },
......
...@@ -169,13 +169,12 @@ ...@@ -169,13 +169,12 @@
<script> <script>
import {getCurrencyList} from "@/api/ecw/currency" import {getCurrencyList} from "@/api/ecw/currency"
import { import {
finishPacked, finishStock, finishStock,
getLabelByOrder, getLabelWaitInByOrder,
getOrder, getOrder,
getOrderWarehouseIn, getOrderWarehouseIn,
getSpecialListByOrderId, listByOrderId, noNeedPack, getSpecialListByOrderId,
orderWarehouseInFinish, orderWarehouseInUpdateLabel, noNeedPack,
rollbackDelete, warehousePictureList warehousePictureList
} from '@/api/ecw/order' } from '@/api/ecw/order'
import orderBaseInfo from "@/components/OrderBaseInfo" import orderBaseInfo from "@/components/OrderBaseInfo"
import WarehouseAreaDialog from '@/components/WarehouseAreaDialog' import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
...@@ -344,12 +343,13 @@ export default { ...@@ -344,12 +343,13 @@ export default {
noNeedPack(row){ noNeedPack(row){
noNeedPack(row.orderItemId).then(res => { noNeedPack(row.orderItemId).then(res => {
this.$message.success(this.$t('操作成功')) this.$message.success(this.$t('操作成功'))
this.getList()
}) })
}, },
onPackageClose(){ onPackageClose(){
this.packageOrderItem=null; this.packageOrderItem=null;
this.packageOrderItem=null; this.packageOrderItem=null;
this.getOrderItemList() this.getList()
} }
}, },
watch: { watch: {
......
...@@ -192,7 +192,7 @@ import { getProductAttrList } from '@/api/ecw/productAttr' ...@@ -192,7 +192,7 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
import CustomerSelector from '@/components/CustomerSelector' import CustomerSelector from '@/components/CustomerSelector'
import specialNeeds from '@/views/ecw/order/components/specialNeeds'; import specialNeeds from '@/views/ecw/order/components/specialNeeds';
import {canReadyStockShipmentPage, exportReadyStock, getOrderPage, orderSpecialNeed} from "@/api/ecw/order"; import {canReadyStockShipmentPage, exportReadyStock, canShipmentPage, orderSpecialNeed} from "@/api/ecw/order";
import PrintTag from './components/PrintTag' import PrintTag from './components/PrintTag'
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
...@@ -300,7 +300,7 @@ export default { ...@@ -300,7 +300,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
// 执行查询 // 执行查询
canReadyStockShipmentPage(this.combinedQueryParams).then(response => { canShipmentPage(this.combinedQueryParams).then(response => {
// 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常 // 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常
this.list = [] this.list = []
this.$nextTick(() => { this.$nextTick(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment