diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue index 94f34d6..e312756 100644 --- a/src/pages/equipment/Inspection/details.vue +++ b/src/pages/equipment/Inspection/details.vue @@ -193,11 +193,11 @@ export default class ChangePalletNew extends BasePage { console.log(item, value, index, index1); this.radiomodal = false; this.inputmodal = false; - if (value == null || value == '') { - this.isvalue = true; - } else { - this.isvalue = false; - } + // if (value == null || value == '') { + // this.isvalue = true; + // } else { + // this.isvalue = false; + // } if (value > item.detailUpLimit || value < item.detailDownLimit) { this.equipmentindex = []; this.equipmentindex.push(index); @@ -452,6 +452,7 @@ export default class ChangePalletNew extends BasePage { title: '检查标准不能为空', type: 'default', }); + this.isvalue = false; return; } this.detailsinfolist.planPersonName = session.nickName; diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue index 98b88da..75ea601 100644 --- a/src/pages/equipment/Inspection/detailsview.vue +++ b/src/pages/equipment/Inspection/detailsview.vue @@ -60,6 +60,7 @@
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
+
巡检时间:{{ detailsinfolist.orderStart }}
报修单:{{ detailsinfolist.repairCode }}
diff --git a/src/pages/equipment/SparepartsInto/index.vue b/src/pages/equipment/SparepartsInto/index.vue index 1956d38..c010fc6 100644 --- a/src/pages/equipment/SparepartsInto/index.vue +++ b/src/pages/equipment/SparepartsInto/index.vue @@ -16,15 +16,15 @@ - - + + - - + + - + @@ -83,7 +83,7 @@ export default class SparepartsInto extends BasePage { }; shouciFocus = true; rules: any = { - spareCode: [ + materialCode: [ { required: true, message: '编码不能为空', @@ -91,7 +91,7 @@ export default class SparepartsInto extends BasePage { trigger: ['change', 'blur'], }, ], - spareName: [ + materialDesc: [ { required: true, message: '名称不能为空', @@ -100,7 +100,7 @@ export default class SparepartsInto extends BasePage { ], amount: [ { - required: false, + required: true, message: '库存不能为空', trigger: ['change', 'blur'], }, diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue index 2bb7127..5e588aa 100644 --- a/src/pages/equipment/Spotcheck/details.vue +++ b/src/pages/equipment/Spotcheck/details.vue @@ -166,11 +166,11 @@ export default class ChangePalletNew extends BasePage { console.log(item, value, index, index1); this.radiomodal = false; this.inputmodal = false; - if (value == null || value == '') { - this.isvalue = true; - } else { - this.isvalue = false; - } + // if (value == null || value == '') { + // this.isvalue = true; + // } else { + // this.isvalue = false; + // } if (value > item.detailUpLimit || value < item.detailDownLimit) { this.equipmentindex = []; this.equipmentindex.push(index); @@ -373,20 +373,21 @@ export default class ChangePalletNew extends BasePage { this.detailsinfolist.detailList.forEach((item) => { if (item.standardList.length > 0) { item.standardList.forEach((item1) => { - if (item1.standardType == 'quantify') { + if (item1.standardType === 'quantify') { if (item1.actualValue == null || item1.actualValue == '') { - // console.log(this.isvalue); this.isvalue = true; } } }); } }); + console.log('choubug222', this.isvalue); if (this.isvalue) { (this.$refs.uToast as any).show({ title: '检查标准不能为空', type: 'default', }); + this.isvalue = false; return; } this.detailsinfolist.planPersonName = session.nickName; diff --git a/src/pages/equipment/Spotcheck/detailsview.vue b/src/pages/equipment/Spotcheck/detailsview.vue index 519014b..9863f5e 100644 --- a/src/pages/equipment/Spotcheck/detailsview.vue +++ b/src/pages/equipment/Spotcheck/detailsview.vue @@ -58,6 +58,7 @@
点检人:{{ detailsinfolist.planPersonName }}
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
+
点检时间:{{ detailsinfolist.orderStart }}
报修单:{{ detailsinfolist.repairCode }}
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue index 8cabc8e..5619169 100644 --- a/src/pages/equipment/Upkeep/repairing.vue +++ b/src/pages/equipment/Upkeep/repairing.vue @@ -306,11 +306,11 @@ export default class ChangePalletNew extends BasePage { console.log(item, value, index, index1); this.radiomodal = false; this.inputmodal = false; - if (value == null || value == '') { - this.isvalue = true; - } else { - this.isvalue = false; - } + // if (value == null || value == '') { + // this.isvalue = true; + // } else { + // this.isvalue = false; + // } console.log(this.isvalue, value == null, value == ''); if (value > item.detailUpLimit || value < item.detailDownLimit) { this.equipmentindex = []; @@ -610,6 +610,7 @@ export default class ChangePalletNew extends BasePage { title: '检查标准不能为空', type: 'default', }); + this.isvalue = false; return; } console.log(this.formdata.orderCost); diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index cec1b76..ed102a0 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -143,7 +143,7 @@ export default class LoginPage extends BasePage { } ///********版本号修改区域********** version = '0.0.73'; //正式版本号 - //version = '0.0.3'; //测试版本号 + //version = '0.0.4'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/utils/request.ts b/src/utils/request.ts index e818e2a..b3f8ff0 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -23,15 +23,15 @@ http.interceptors.request.use( (config: any) => { //console.log('123456',config) //生产请将注释解开重要重要 - if (config.url.includes('/api')) { - config.baseURL = 'http://192.168.202.23:5001'; - }else if(config.url.includes('http')) { - //直接使用写死地址 - }else { - config.baseURL = 'http://192.168.202.34:30000' - //'http://192.168.202.20:9000' ///测试 - //'http://192.168.202.34:30000'; //正式 - } + // if (config.url.includes('/api')) { + // config.baseURL = 'http://192.168.202.23:5001'; + // }else if(config.url.includes('http')) { + // //直接使用写死地址 + // }else { + // config.baseURL = 'http://192.168.202.20:9000' + // //'http://192.168.202.20:9000' ///测试 + // //'http://192.168.202.34:30000'; //正式 + // } // 所有请求默认提示加载中 if (!loading) { uni.showLoading({ title: '加载中' }); @@ -99,7 +99,7 @@ http.interceptors.response.use( case 10: return dataAxios; case 0: - return dataAxios; + return dataAxios; case 200: return dataAxios; case 401: