feat(wms): 添加库位分割合并功能并优化仓库展示
refactor(warehouse): 重构仓库组件为按列展示模式 - 将分层展示改为分列展示,每列包含上下两层库位 - 添加右键菜单支持分割、合并操作 - 优化库位格子样式和交互 feat(crm): 新增订单编辑组件并实现自动保存 - 添加OrderEdit组件支持订单信息编辑 - 实现2秒延迟自动保存功能 - 优化订单详情页面布局 fix(delivery): 在查询参数中添加当前用户ID - 在mycoil列表查询中添加saleId参数 style(preOrder): 注释掉审核人和审核时间列 - 隐藏预订单列表中的审核信息列 chore(warehouse): 移除仓库实体的导入导出按钮 - 注释掉仓库管理页面的模板下载和导入功能
This commit is contained in:
@@ -57,6 +57,8 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="订单编辑" name="edit">
|
||||
<div class="order-detail" v-if="activeTab === 'edit'">
|
||||
<OrderEdit :initValue="currentOrder" :customerList="customerList" @save="handleOrderSave" />
|
||||
<el-descriptions title="订单明细" />
|
||||
<OrderDetail :orderId="currentOrder.orderId" />
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
@@ -122,16 +124,18 @@
|
||||
|
||||
<script>
|
||||
import KLPList from '@/components/KLPUI/KLPList/index.vue'
|
||||
import { listOrder, addOrder, delOrder } from "@/api/crm/order";
|
||||
import { listOrder, addOrder, delOrder, updateOrder } from "@/api/crm/order";
|
||||
import { listCustomer } from "@/api/crm/customer";
|
||||
import { ORDER_STATUS, ORDER_TYPE } from '../js/enum'
|
||||
import OrderDetail from '../components/OrderDetail.vue';
|
||||
import OrderEdit from '../components/OrderEdit.vue';
|
||||
|
||||
export default {
|
||||
name: 'OrderPage',
|
||||
components: {
|
||||
KLPList,
|
||||
OrderDetail
|
||||
OrderDetail,
|
||||
OrderEdit
|
||||
},
|
||||
dicts: ['customer_level', 'customer_industry'],
|
||||
data() {
|
||||
@@ -249,28 +253,34 @@ export default {
|
||||
});
|
||||
});
|
||||
},
|
||||
handleOrderSave(form) {
|
||||
this.form = form;
|
||||
console.log('保存订单:', form, this)
|
||||
const that = this;
|
||||
that.submitForm()
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
async submitForm() {
|
||||
if (this.form.orderId) {
|
||||
updateOrder(this.form).then(_ => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
if (this.form.orderId != null) {
|
||||
updateOrder(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addOrder(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
addOrder(this.form).then(_ => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user