添加组件及页面
This commit is contained in:
@@ -1,43 +1,36 @@
|
||||
import { loginStatus, post } from "@/utils/https";
|
||||
import {
|
||||
formatTime,
|
||||
getAuthInfo,
|
||||
getDataSet,
|
||||
isArray,
|
||||
toArray,
|
||||
toObject,
|
||||
} from "@/utils/util";
|
||||
import { voiceRequest } from "@/utils/voiceUtil";
|
||||
import { loginStatus, post } from '@/utils/https';
|
||||
import { formatTime, getAuthInfo, getDataSet, isArray, toArray, toObject } from '@/utils/util';
|
||||
import { voiceRequest } from '@/utils/voiceUtil';
|
||||
|
||||
/** 拼接符号 */
|
||||
const ProcessCodeConcatSymbol = "&&";
|
||||
const ProcessCodeConcatSymbol = '&&';
|
||||
/** 撤回码标记 */
|
||||
const RecallCodeMarking = "-";
|
||||
const RecallCodeMarking = '-';
|
||||
|
||||
/**
|
||||
* 解析流程码
|
||||
* @param {string} value
|
||||
*/
|
||||
const parseQrCode = (value: string) => {
|
||||
value = `${value || ""}`;
|
||||
value = `${value || ''}`;
|
||||
const obj = {
|
||||
/** 工序码 */
|
||||
code: value,
|
||||
/** 提成自定义字段 */
|
||||
key: "",
|
||||
key: '',
|
||||
/** - => 撤回码 */
|
||||
type: "",
|
||||
type: '',
|
||||
};
|
||||
if (value.includes(ProcessCodeConcatSymbol)) {
|
||||
obj.code = value.substring(0, value.indexOf(ProcessCodeConcatSymbol));
|
||||
obj.key = value.substring(
|
||||
value.indexOf(ProcessCodeConcatSymbol) + ProcessCodeConcatSymbol.length
|
||||
value.indexOf(ProcessCodeConcatSymbol) + ProcessCodeConcatSymbol.length,
|
||||
);
|
||||
}
|
||||
|
||||
if (obj.code.includes(RecallCodeMarking)) {
|
||||
obj.type = RecallCodeMarking;
|
||||
obj.code = obj.code.replace(RecallCodeMarking, "");
|
||||
obj.code = obj.code.replace(RecallCodeMarking, '');
|
||||
}
|
||||
|
||||
return obj;
|
||||
@@ -48,10 +41,12 @@ Page({
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
action: "end",
|
||||
processCodeMsg: "",
|
||||
rel_order_no: "",
|
||||
process_code: "",
|
||||
action: 'end',
|
||||
processCodeMsg: '',
|
||||
// rel_order_no: 'XSDD2026011500000190',
|
||||
// process_code: 'jd',
|
||||
rel_order_no: '',
|
||||
process_code: '',
|
||||
logsList: [] as any[],
|
||||
show: false,
|
||||
orders: [] as any[],
|
||||
@@ -63,49 +58,42 @@ Page({
|
||||
hideTabKeys: [] as string[],
|
||||
processItems: [] as any[],
|
||||
backFlag: false,
|
||||
selectedProcessCode: "",
|
||||
result: "",
|
||||
logType: "0",
|
||||
/** 默认提成 */
|
||||
defaultBonus: true,
|
||||
showDefaultBonus: false,
|
||||
defaultBonusConfig: {},
|
||||
defaultBonusConfigKeys: [] as string[],
|
||||
rel_order_no_temp: "",
|
||||
selectedProcessCode: '',
|
||||
result: '',
|
||||
logType: '0',
|
||||
rel_order_no_temp: '',
|
||||
},
|
||||
handleLogin(e: any) {
|
||||
this.setData({ isLogin: e.detail });
|
||||
if (e.detail) {
|
||||
this.setData({ isLogin: true, authInfo: getAuthInfo() });
|
||||
this.init();
|
||||
} else {
|
||||
this.setData({ isLogin: false });
|
||||
}
|
||||
},
|
||||
backChange(e: any) {
|
||||
this.data.backFlag = e.detail;
|
||||
this.setData({ backFlag: e.detail });
|
||||
wx.setStorageSync("processBackFlag", e.detail ? 1 : 0);
|
||||
const checked = e.detail.checked;
|
||||
this.data.backFlag = checked;
|
||||
this.setData({ backFlag: checked });
|
||||
wx.setStorageSync('processBackFlag', checked ? 1 : 0);
|
||||
if (this.data.selectedProcessCode) {
|
||||
const { code, key } = parseQrCode(this.data.selectedProcessCode);
|
||||
this.data.selectedProcessCode = `${code}${
|
||||
e.detail ? RecallCodeMarking : ""
|
||||
}`;
|
||||
this.data.selectedProcessCode = `${code}${checked ? RecallCodeMarking : ''}`;
|
||||
if (key) {
|
||||
this.data.selectedProcessCode += `${ProcessCodeConcatSymbol}${key}`;
|
||||
}
|
||||
}
|
||||
wx.setStorageSync('selectedProcessCode', this.data.selectedProcessCode);
|
||||
this.getProcessName();
|
||||
},
|
||||
getProcessName() {
|
||||
if (this.data.selectedProcessCode) {
|
||||
const { code, type } = parseQrCode(this.data.selectedProcessCode);
|
||||
for (const ell of this.data.processItems) {
|
||||
if (ell.code == code) {
|
||||
if (ell.process_code == code) {
|
||||
this.setData({
|
||||
processCodeMsg: `工序名称:${ell.name || ""}(${ell.code})`,
|
||||
processCodeMsg: `工序名称:${ell.process_name || ''}(${ell.process_code})`,
|
||||
selectedProcessCode: this.data.selectedProcessCode,
|
||||
process_code: this.data.selectedProcessCode,
|
||||
action: type ? "back" : "end",
|
||||
action: type ? 'back' : 'end',
|
||||
});
|
||||
break;
|
||||
}
|
||||
@@ -113,19 +101,19 @@ Page({
|
||||
}
|
||||
},
|
||||
processItemTap(e: any) {
|
||||
this.data.selectedProcessCode =
|
||||
e.currentTarget.dataset.code + (this.data.backFlag ? "-" : "");
|
||||
wx.setStorageSync("selectedProcessCode", this.data.selectedProcessCode);
|
||||
this.data.selectedProcessCode = e.currentTarget.dataset.code + (this.data.backFlag ? '-' : '');
|
||||
wx.setStorageSync('selectedProcessCode', this.data.selectedProcessCode);
|
||||
this.setData({
|
||||
selectedProcessCode: this.data.selectedProcessCode,
|
||||
});
|
||||
|
||||
this.getProcessName();
|
||||
},
|
||||
getExecProcess() {
|
||||
post("Orders/getExecProcess1").then((res: any) => {
|
||||
post('CompanyProcessV2/getProcessByCode').then((res: any) => {
|
||||
this.data.processItems = toArray(res.data);
|
||||
if (this.data.processItems.length == 1) {
|
||||
this.data.selectedProcessCode = this.data.processItems[0].code;
|
||||
this.data.selectedProcessCode = this.data.processItems[0].process_code;
|
||||
this.getProcessName();
|
||||
} else {
|
||||
this.getProcessName();
|
||||
@@ -136,15 +124,16 @@ Page({
|
||||
});
|
||||
},
|
||||
init() {
|
||||
const companyInfo = toObject(wx.getStorageSync("company_info"));
|
||||
const code = wx.getStorageSync("selectedProcessCode") || "";
|
||||
const companyInfo = toObject(wx.getStorageSync('company_info'));
|
||||
const code = wx.getStorageSync('selectedProcessCode') || '';
|
||||
this.data.selectedProcessCode = code;
|
||||
this.data.process_code = code;
|
||||
this.data.backFlag = wx.getStorageSync("processBackFlag") == 1;
|
||||
const logType = wx.getStorageSync("processEntry_logType");
|
||||
this.data.backFlag = wx.getStorageSync('processBackFlag') == 1;
|
||||
const logType = wx.getStorageSync('processEntry_logType');
|
||||
|
||||
this.setData({
|
||||
hideTabKeys: companyInfo.staff_type == 3 ? ["2"] : [],
|
||||
authInfo: getAuthInfo(),
|
||||
hideTabKeys: companyInfo.staff_type == 3 ? ['2'] : [],
|
||||
backFlag: this.data.backFlag,
|
||||
selectedProcessCode: code,
|
||||
process_code: code,
|
||||
@@ -156,9 +145,10 @@ Page({
|
||||
this.setData({
|
||||
voice: event.detail,
|
||||
});
|
||||
wx.setStorageSync("processEntryVoice", `${event.detail}`);
|
||||
wx.setStorageSync('processEntryVoice', `${event.detail}`);
|
||||
},
|
||||
getVoice(msg: string, cacheVoice?: boolean) {
|
||||
return;
|
||||
if (this.data.voice && msg) {
|
||||
voiceRequest(msg, cacheVoice);
|
||||
}
|
||||
@@ -166,18 +156,19 @@ Page({
|
||||
onLogTypeChange(e: any) {
|
||||
const data = getDataSet(e);
|
||||
this.setData({ logType: data.key });
|
||||
wx.setStorageSync("processEntry_logType", data.key);
|
||||
wx.setStorageSync('processEntry_logType', data.key);
|
||||
},
|
||||
scanCode() {
|
||||
this.data.isScanCode = true;
|
||||
wx.scanCode({
|
||||
onlyFromCamera: true,
|
||||
scanType: ["qrCode"],
|
||||
scanType: ['qrCode'],
|
||||
success: (res) => {
|
||||
console.log(res);
|
||||
const qrcode = res.result || "";
|
||||
const qrcode = res.result || '';
|
||||
|
||||
if (qrcode) {
|
||||
if (qrcode.startsWith("DD") || qrcode.startsWith("LC")) {
|
||||
if (qrcode.startsWith('XSDD')) {
|
||||
if (this.data.process_code) {
|
||||
this.data.rel_order_no = qrcode;
|
||||
this.setData({
|
||||
@@ -185,16 +176,13 @@ Page({
|
||||
});
|
||||
this.processEnter();
|
||||
} else {
|
||||
wx.showToast({
|
||||
title: "请扫流程码",
|
||||
icon: "none",
|
||||
});
|
||||
wx.showToast({ title: '请扫流程码', icon: 'none' });
|
||||
}
|
||||
} else {
|
||||
const code = parseQrCode(qrcode);
|
||||
this.setData({
|
||||
action: code.type == RecallCodeMarking ? "back" : "end",
|
||||
rel_order_no: "",
|
||||
action: code.type == RecallCodeMarking ? 'back' : 'end',
|
||||
rel_order_no: '',
|
||||
});
|
||||
this.getProcess(qrcode);
|
||||
}
|
||||
@@ -208,41 +196,32 @@ Page({
|
||||
},
|
||||
});
|
||||
},
|
||||
getProcess(real_code: any) {
|
||||
const code = parseQrCode(real_code);
|
||||
post("CompanyProcess/processChildList", {
|
||||
getProcess(process_code: any) {
|
||||
const code = parseQrCode(process_code);
|
||||
post('/CompanyProcessV2/getProcessByCode', {
|
||||
curr_page: 1,
|
||||
page_count: 1,
|
||||
real_code: code.code,
|
||||
process_code: code.code,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data;
|
||||
if (Array.isArray(res.data) && data.length) {
|
||||
this.setData({
|
||||
processCodeMsg: `工序名称:${data[0].name || ""}(${real_code})`,
|
||||
process_code: real_code,
|
||||
selectedProcessCode: real_code,
|
||||
});
|
||||
this.getVoice(`${data[0].name}工序`, true);
|
||||
wx.showToast({
|
||||
title: "请扫订单二维码",
|
||||
icon: "none",
|
||||
processCodeMsg: `工序名称:${data[0].process_name || ''}(${process_code})`,
|
||||
process_code: process_code,
|
||||
selectedProcessCode: process_code,
|
||||
});
|
||||
this.getVoice(`${data[0].process_name}工序`, true);
|
||||
wx.showToast({ title: '请扫订单二维码', icon: 'none' });
|
||||
} else {
|
||||
this.addMsg("未找到 " + real_code + " 工序");
|
||||
wx.showToast({
|
||||
title: "未找到该工序",
|
||||
icon: "error",
|
||||
});
|
||||
this.addMsg('未找到 ' + process_code + ' 工序');
|
||||
wx.showToast({ title: '未找到该工序', icon: 'error' });
|
||||
this.getVoice(`未找到工序`, true);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.addMsg("未找到 " + real_code + " 工序");
|
||||
wx.showToast({
|
||||
title: "未找到该工序",
|
||||
icon: "error",
|
||||
});
|
||||
this.addMsg('未找到 ' + process_code + ' 工序');
|
||||
wx.showToast({ title: '未找到该工序', icon: 'error' });
|
||||
});
|
||||
},
|
||||
processEnter() {
|
||||
@@ -253,8 +232,12 @@ Page({
|
||||
},
|
||||
LCProcessEnter(e: any) {
|
||||
const item = this.data.orders[e.currentTarget.dataset.index];
|
||||
this.data.rel_order_no_temp = item.rel_order_no;
|
||||
this.setProcess();
|
||||
this.data.rel_order_no_temp = item.order_no;
|
||||
this.setProcess({
|
||||
info_process_id: JSON.stringify([item.info_process_id]),
|
||||
action: this.data.action,
|
||||
if_scan: 1,
|
||||
});
|
||||
},
|
||||
setProcess(other?: any) {
|
||||
const code = parseQrCode(this.data.process_code);
|
||||
@@ -262,42 +245,31 @@ Page({
|
||||
if (code.key) {
|
||||
obj[this.data.rel_order_no_temp] = code.key;
|
||||
}
|
||||
post("Orders/setProcess", {
|
||||
param: JSON.stringify({
|
||||
rel_order_no: this.data.rel_order_no_temp,
|
||||
process_code: code.code,
|
||||
action: this.data.action,
|
||||
if_scan: 1,
|
||||
same_process: this.data.rel_order_no_temp.startsWith("LC")
|
||||
? 1
|
||||
: undefined,
|
||||
// defaultBonus: getDefaultBonus() != "0",
|
||||
}),
|
||||
other: JSON.stringify({ ...other, ...obj }),
|
||||
})
|
||||
post(
|
||||
'ProduceOrder/setProcessV2',
|
||||
other
|
||||
? other
|
||||
: {
|
||||
order_no: this.data.rel_order_no_temp,
|
||||
process_code: code.code,
|
||||
action: this.data.action,
|
||||
if_scan: 1,
|
||||
},
|
||||
)
|
||||
.then((res: any) => {
|
||||
if (res.bonus == 1) {
|
||||
const data = toObject(res.data);
|
||||
this.setData({
|
||||
defaultBonusConfig: data,
|
||||
defaultBonusConfigKeys: Object.keys(data),
|
||||
showDefaultBonus: true,
|
||||
});
|
||||
} else if (isArray(res.data) && res.data.length) {
|
||||
if (isArray(res.data) && res.data.length) {
|
||||
res.data.forEach((el: any) => {
|
||||
el.product_info_str = toArray(el.product_info)
|
||||
.map((ell) => {
|
||||
return `${ell.room_name || "未命名"}(${
|
||||
ell.goods_name || "未命名"
|
||||
})`;
|
||||
return `${ell.room_name || '未命名'}(${ell.goods_name || '未命名'})`;
|
||||
})
|
||||
.join(",");
|
||||
.join(',');
|
||||
|
||||
el.sale_info_str = toArray(el.sale_info)
|
||||
.map((ell) => {
|
||||
return `${ell.goods_name}`;
|
||||
})
|
||||
.join(",");
|
||||
.join(',');
|
||||
});
|
||||
|
||||
this.setData({
|
||||
@@ -307,57 +279,42 @@ Page({
|
||||
} else {
|
||||
this.addMsg(res.err_msg);
|
||||
// this.getVoice(res.err_msg);
|
||||
this.getVoice("通过");
|
||||
this.getVoice('通过');
|
||||
this.setData({
|
||||
show: false,
|
||||
result: "success",
|
||||
showDefaultBonus: false,
|
||||
result: 'success',
|
||||
});
|
||||
wx.showToast({
|
||||
title: res.err_msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch((res: any) => {
|
||||
this.addMsg(res.err_msg);
|
||||
if (res.err_code == "244269") {
|
||||
if (res.err_code == '244269') {
|
||||
this.setData({
|
||||
result: "success",
|
||||
result: 'success',
|
||||
});
|
||||
wx.showToast({
|
||||
title: res.err_msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
this.getVoice("通过");
|
||||
this.getVoice('通过');
|
||||
} else {
|
||||
this.setData({
|
||||
result: "error",
|
||||
result: 'error',
|
||||
});
|
||||
this.getVoice(res.err_msg);
|
||||
}
|
||||
});
|
||||
},
|
||||
onSelectBonus(e: any) {
|
||||
const data = getDataSet(e);
|
||||
this.setProcess({ [data.order_no]: data.key });
|
||||
},
|
||||
closeDefaultBonusHandle() {
|
||||
this.setData({
|
||||
showDefaultBonus: false,
|
||||
});
|
||||
},
|
||||
// defaultBonusChange(e) {
|
||||
// this.setData({
|
||||
// defaultBonus: e.detail ? "1" : "0",
|
||||
// });
|
||||
// setDefaultBonus(e.detail ? "1" : "0");
|
||||
// },
|
||||
|
||||
addMsg(msg: any) {
|
||||
const now = new Date();
|
||||
this.data.logsList.unshift({
|
||||
date: formatTime(now).substring(5),
|
||||
msg: msg || "",
|
||||
msg: msg || '',
|
||||
});
|
||||
if (this.data.logsList.length > 100) {
|
||||
this.data.logsList.length = 100;
|
||||
@@ -381,20 +338,16 @@ Page({
|
||||
onLoad(_options) {
|
||||
this.setData({
|
||||
loading: true,
|
||||
voice: wx.getStorageSync("processEntryVoice") == "false" ? false : true,
|
||||
voice: wx.getStorageSync('processEntryVoice') == 'false' ? false : true,
|
||||
});
|
||||
loginStatus()
|
||||
.then(() => {
|
||||
this.setData({
|
||||
isLogin: true,
|
||||
loading: false,
|
||||
authInfo: getAuthInfo(),
|
||||
});
|
||||
this.setData({ isLogin: true, loading: false });
|
||||
this.init();
|
||||
})
|
||||
.catch((err) => {
|
||||
this.setData({ isLogin: false, loading: false });
|
||||
console.log("调用登录状态请求失败", err);
|
||||
console.log('调用登录状态请求失败', err);
|
||||
});
|
||||
},
|
||||
|
||||
@@ -408,11 +361,6 @@ Page({
|
||||
*/
|
||||
onShow() {
|
||||
wx.hideHomeButton();
|
||||
this.setData({
|
||||
// defaultBonus: getDefaultBonus() != "0",
|
||||
});
|
||||
// if (!this.data.isScanCode) {
|
||||
// }
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user