diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 41a41bc..ee22464 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
- version = '0.0.137'; //正式版本号
+ version = '0.0.138'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本****************
//isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 47a4d89..4452a26 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -389,7 +389,7 @@
@@ -673,13 +673,13 @@ export default class PurchaseWHSRM extends BasePage {
//收货按钮
tagClick(index) {
- // if (index + 1 != this.tagslist.length) {
- // (this.$refs.uToast as any).show({
- // title: '请按顺序删除',
- // type: 'default',
- // });
- // return;
- // }
+ if (index + 1 != this.tagslist.length) {
+ (this.$refs.uToast as any).show({
+ title: '请按顺序删除',
+ type: 'default',
+ });
+ return;
+ }
this.tagslist.splice(index, 1);
}
hasDuplicateValueIndex(arr) {
@@ -696,22 +696,16 @@ export default class PurchaseWHSRM extends BasePage {
});
return;
}
-
+ console.log(this.tagslist, 'sadasdww');
let a: any = {};
a.value = this.tagsvalue;
- a.valueindex = this.serialnumber;
+ a.valueindex = this.tagslist.length + 1;
a.label = a.valueindex + ':' + a.value;
- const exists = this.tagslist.some((item) => item.valueindex === a.valueindex);
- // 如果不存在相同的 valueindex,则可以添加
- if (!exists) {
- this.tagslist.push(a);
- } else {
- (this.$refs.uToast as any).show({
- title: '已存在,不能添加',
- type: 'default',
- });
- }
-
+ this.tagslist.push(a);
+ // this.isfocus = false;
+ // this.$nextTick(() => {
+ // this.isfocus = true;
+ // });
// this.isfocus = false;
// this.$nextTick(() => {
// this.isfocus = true;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1b95191..e440645 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -116,7 +116,7 @@ http.interceptors.response.use(
store.dispatch('session/logout');
uni.setStorageSync('showLoginTips', true);
uni.switchTab({ url: '/pages/personal/index' });
- errorCreate(dataAxios.message, response.config.custom.hideError);
+ errorCreate(dataAxios.msg || dataAxios.message, response.config.custom.hideError);
break;
default:
// 不是正确的 code
@@ -131,7 +131,7 @@ http.interceptors.response.use(
return dataAxios;
default:
// 不是正确的 code
- errorCreate(dataAxios.msg, response.config.custom.hideError);
+ errorCreate(dataAxios.msg || dataAxios.message, response.config.custom.hideError);
break;
}
}
@@ -208,7 +208,7 @@ function errorLog(error: Error, hideError: boolean) {
if (error.message) {
content = error.message;
} else {
- content = '网络请求超时';
+ content = '提交异常,请检测填写数据,重试';
}
// 显示提示
hideError ||