mes功能bug修改&生产服务切换

master
guoshuang 2 years ago
parent 2b7fd85111
commit 22821ba2c9

@ -230,11 +230,12 @@ export default class productCheckReceipt extends BasePage {
this.customToast('请输入nficl'); this.customToast('请输入nficl');
return; return;
} }
let orderNoItemList = await this.model.queryOrderNo(this.orderNo); await this.model.queryOrderNo(this.orderNo);
if (orderNoItemList == undefined) { //console.log('???',model.orderNoItemList)
if (model.orderNoItemList == undefined) {
this.customToast('该rfid未查到数据请使用正确的rfid'); this.customToast('该rfid未查到数据请使用正确的rfid');
} else { } else {
this.orderNoItemList = orderNoItemList; this.orderNoItemList = model.orderNoItemList;
} }
//console.log('this.orderNoItemList', this.orderNoItemList); //console.log('this.orderNoItemList', this.orderNoItemList);
} }
@ -257,7 +258,7 @@ export default class productCheckReceipt extends BasePage {
this.customToast('请输入nficl'); this.customToast('请输入nficl');
return; return;
} }
if (this.orderNoItemList.orderCode == undefined) { if (Object.keys(this.orderNoItemList).length === 0) {
this.customToast('该rfid不可用不可质检'); this.customToast('该rfid不可用不可质检');
return; return;
} }
@ -309,7 +310,7 @@ export default class productCheckReceipt extends BasePage {
checkResult: this.productCodeList.value, checkResult: this.productCodeList.value,
}; };
await this.model.sendDestinationStations(params); await this.model.sendDestinationStations(params);
this.uni.showToast({ title: '质检成功' }); //this.uni.showToast({ title: '' });
this.orderNo = ''; this.orderNo = '';
this.badMeg = ''; this.badMeg = '';
this.productCodeList = {}; this.productCodeList = {};

@ -23,11 +23,11 @@ let loading: any;
http.interceptors.request.use( http.interceptors.request.use(
(config: any) => { (config: any) => {
//console.log('123456',config) //console.log('123456',config)
//生产请将注释解开 //生产请将注释解开重要重要
// if (config.url.includes('/api')) { // if (config.url.includes('/api')) {
// config.baseURL = 'http://192.168.202.23:5001'; // config.baseURL = 'http://192.168.202.23:5001';
// } else { // } else {
// config.baseURL = 'http://192.168.202.20:9000'; // config.baseURL = 'http://192.168.202.34:30000';
// } // }
// 所有请求默认提示加载中 // 所有请求默认提示加载中
if (!loading) { if (!loading) {
@ -104,7 +104,7 @@ http.interceptors.response.use(
break; break;
default: default:
// 不是正确的 code // 不是正确的 code
errorCreate(dataAxios.msg, response.config.custom.hideError); errorCreate(dataAxios.msg || dataAxios.message, response.config.custom.hideError);
break; break;
} }
} else if (status !== undefined) { } else if (status !== undefined) {

@ -2,8 +2,10 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/prod-api': { '/prod-api': {
//target: 'http://192.168.3.93:81', //正式生产
target: 'http://192.168.202.20:9000', target: 'http://192.168.202.34:30000',
//测试生产
//target: 'http://192.168.202.20:9000',
changeOrigin: true, changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// '^/prod-ap': '', // '^/prod-ap': '',

Loading…
Cancel
Save