feat: 优化手动进仓扫码流程并升至1.1.22
This commit is contained in:
@@ -46,12 +46,12 @@ export const FABRIC_INFO_FIELDS = [
|
||||
|
||||
/** 细码表格列(不含操作列) */
|
||||
export const FINE_CODE_TABLE_COLUMNS = [
|
||||
{ label: '序号', key: 'seq', width: 70 },
|
||||
{ label: '卷号', key: 'roll_no', width: 90 },
|
||||
{ label: '匹数', key: 'roll', width: 90 },
|
||||
{ label: '数量(重量)', key: 'weight', width: 120 },
|
||||
{ label: '条码', key: 'bar_code', width: 260 },
|
||||
{ label: '仓位', key: 'position', width: 110 },
|
||||
{ label: '序号', key: 'seq', width: 90 },
|
||||
{ label: '卷号', key: 'roll_no', width: 110 },
|
||||
{ label: '匹数', key: 'roll', width: 100 },
|
||||
{ label: '数量(重量)', key: 'weight', width: 160 },
|
||||
{ label: '条码', key: 'bar_code', width: 280 },
|
||||
{ label: '仓位', key: 'position', width: 140 },
|
||||
];
|
||||
|
||||
/** 审核状态变更操作配置(apiKey 对应 gfmOtherDeliveryOrder 下的方法名) */
|
||||
@@ -490,7 +490,8 @@ export function orderToFormFields(order) {
|
||||
|
||||
export function getFineCodeTableColumns(readonly) {
|
||||
const cols = [...FINE_CODE_TABLE_COLUMNS];
|
||||
if (!readonly) cols.push({ label: '操作', key: 'action', width: 90 });
|
||||
// 操作列放前面,避免 PDA 小屏横向滚动后才看到删除
|
||||
if (!readonly) cols.splice(1, 0, { label: '操作', key: 'action', width: 160 });
|
||||
return cols;
|
||||
}
|
||||
|
||||
@@ -516,7 +517,7 @@ export function getFineCodeTableWidth(columns) {
|
||||
* @param {Vue} vm 页面实例,需有 $u.api 与 showError
|
||||
* @param {{ orderId: number, action: string, onSuccess?: Function }} options
|
||||
*/
|
||||
export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
|
||||
export function confirmOrderStatusAction(vm, { orderId, action, onSuccess, onCancel }) {
|
||||
const cfg = STATUS_ACTION_CONFIG[action];
|
||||
if (!cfg || !orderId) return;
|
||||
const api = vm.$u.api.gfmOtherDeliveryOrder;
|
||||
@@ -526,7 +527,10 @@ export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
|
||||
title: '提示',
|
||||
content: cfg.msg,
|
||||
success: (res) => {
|
||||
if (!res.confirm) return;
|
||||
if (!res.confirm) {
|
||||
if (typeof onCancel === 'function') onCancel();
|
||||
return;
|
||||
}
|
||||
uni.showLoading({ title: '处理中...' });
|
||||
requestFn(buildStatusParam(orderId, cfg.status))
|
||||
.then(() => {
|
||||
|
||||
Reference in New Issue
Block a user