Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mes测试修改

Browse Source
master
guoshuang 12 months ago
parent 6d9a913d4f
commit 0449df6b2f
8 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File

11
src/pages/equipment/Inspection/details.vue
Unescape Escape View File

@ -193,11 +193,11 @@ export default class ChangePalletNew extends BasePage {
console.log(item, value, index, index1); console.log(item, value, index, index1);
this.radiomodal = false; this.radiomodal = false;
this.inputmodal = false; this.inputmodal = false;
if (value == null || value == '') { // if (value == null || value == '') {
this.isvalue = true; // this.isvalue = true;
} else { // } else {
this.isvalue = false; // this.isvalue = false;
} // }
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex = []; this.equipmentindex = [];
this.equipmentindex.push(index); this.equipmentindex.push(index);
@ -452,6 +452,7 @@ export default class ChangePalletNew extends BasePage {
title: '检查标准不能为空', title: '检查标准不能为空',
type: 'default', type: 'default',
}); });
this.isvalue = false;
return; return;
} }
this.detailsinfolist.planPersonName = session.nickName; this.detailsinfolist.planPersonName = session.nickName;

1
src/pages/equipment/Inspection/detailsview.vue
Unescape Escape View File

@ -60,6 +60,7 @@
<div>是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}</div> <div>是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}</div>
</div> </div>
<div class="details"> <div class="details">
<!-- <div>工号:{{detailsinfolist.planPerson}}</div> -->
<div>巡检时间:{{ detailsinfolist.orderStart }}</div> <div>巡检时间:{{ detailsinfolist.orderStart }}</div>
<div>报修单:{{ detailsinfolist.repairCode }}</div> <div>报修单:{{ detailsinfolist.repairCode }}</div>
</div> </div>

16
src/pages/equipment/SparepartsInto/index.vue
Unescape Escape View File

@ -16,15 +16,15 @@
</div> </div>
<u-form class="form" ref="uForm" :model="formdata" label-width="180rpx"> <u-form class="form" ref="uForm" :model="formdata" label-width="180rpx">
<!-- 单号 --> <!-- 单号 -->
<u-form-item label="备品备件编码" prop="spareCode"> <u-form-item label="备品备件编码" prop="materialCode">
<u-input placeholder="请输入编码" v-model="formdata.spareCode" /> <u-input placeholder="请输入编码" v-model="formdata.materialCode" />
</u-form-item> </u-form-item>
<!-- 订单 --> <!-- 订单 -->
<u-form-item label="备品备件名称" prop="spareName"> <u-form-item label="备品备件名称" prop="materialDesc">
<u-input placeholder="请输入名称" v-model="formdata.spareName" /> <u-input placeholder="请输入名称" v-model="formdata.materialDesc" />
</u-form-item> </u-form-item>
<u-form-item label="现有库存" prop="amount"> <u-form-item label="现有库存" prop="amount">
<u-input placeholder="请输入库存" v-model="orderNoItemList.amount" /> <u-input placeholder="请输入库存" v-model="formdata.amount" />
</u-form-item> </u-form-item>
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="入库数量" prop="quantity"> <u-form-item label="入库数量" prop="quantity">
@ -83,7 +83,7 @@ export default class SparepartsInto extends BasePage {
}; };
shouciFocus = true; shouciFocus = true;
rules: any = { rules: any = {
spareCode: [ materialCode: [
{ {
required: true, required: true,
message: '编码不能为空', message: '编码不能为空',
@ -91,7 +91,7 @@ export default class SparepartsInto extends BasePage {
trigger: ['change', 'blur'], trigger: ['change', 'blur'],
}, },
], ],
spareName: [ materialDesc: [
{ {
required: true, required: true,
message: '名称不能为空', message: '名称不能为空',
@ -100,7 +100,7 @@ export default class SparepartsInto extends BasePage {
], ],
amount: [ amount: [
{ {
required: false, required: true,
message: '库存不能为空', message: '库存不能为空',
trigger: ['change', 'blur'], trigger: ['change', 'blur'],
}, },

15
src/pages/equipment/Spotcheck/details.vue
Unescape Escape View File

@ -166,11 +166,11 @@ export default class ChangePalletNew extends BasePage {
console.log(item, value, index, index1); console.log(item, value, index, index1);
this.radiomodal = false; this.radiomodal = false;
this.inputmodal = false; this.inputmodal = false;
if (value == null || value == '') { // if (value == null || value == '') {
this.isvalue = true; // this.isvalue = true;
} else { // } else {
this.isvalue = false; // this.isvalue = false;
} // }
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex = []; this.equipmentindex = [];
this.equipmentindex.push(index); this.equipmentindex.push(index);
@ -373,20 +373,21 @@ export default class ChangePalletNew extends BasePage {
this.detailsinfolist.detailList.forEach((item) => { this.detailsinfolist.detailList.forEach((item) => {
if (item.standardList.length > 0) { if (item.standardList.length > 0) {
item.standardList.forEach((item1) => { item.standardList.forEach((item1) => {
if (item1.standardType == 'quantify') { if (item1.standardType === 'quantify') {
if (item1.actualValue == null || item1.actualValue == '') { if (item1.actualValue == null || item1.actualValue == '') {
// console.log(this.isvalue);
this.isvalue = true; this.isvalue = true;
} }
} }
}); });
} }
}); });
console.log('choubug222', this.isvalue);
if (this.isvalue) { if (this.isvalue) {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '检查标准不能为空', title: '检查标准不能为空',
type: 'default', type: 'default',
}); });
this.isvalue = false;
return; return;
} }
this.detailsinfolist.planPersonName = session.nickName; this.detailsinfolist.planPersonName = session.nickName;

1
src/pages/equipment/Spotcheck/detailsview.vue
Unescape Escape View File

@ -58,6 +58,7 @@
<div>点检人:{{ detailsinfolist.planPersonName }}</div> <div>点检人:{{ detailsinfolist.planPersonName }}</div>
<div>是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}</div> <div>是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}</div>
</div> </div>
<!-- <div style="font-size: 17px;font-weight: 600;margin-bottom: 8px;">工号:{{ detailsinfolist.planPerson }}</div> -->
<div class="details"> <div class="details">
<div>点检时间:{{ detailsinfolist.orderStart }}</div> <div>点检时间:{{ detailsinfolist.orderStart }}</div>
<div>报修单:{{ detailsinfolist.repairCode }}</div> <div>报修单:{{ detailsinfolist.repairCode }}</div>

11
src/pages/equipment/Upkeep/repairing.vue
Unescape Escape View File

@ -306,11 +306,11 @@ export default class ChangePalletNew extends BasePage {
console.log(item, value, index, index1); console.log(item, value, index, index1);
this.radiomodal = false; this.radiomodal = false;
this.inputmodal = false; this.inputmodal = false;
if (value == null || value == '') { // if (value == null || value == '') {
this.isvalue = true; // this.isvalue = true;
} else { // } else {
this.isvalue = false; // this.isvalue = false;
} // }
console.log(this.isvalue, value == null, value == ''); console.log(this.isvalue, value == null, value == '');
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex = []; this.equipmentindex = [];
@ -610,6 +610,7 @@ export default class ChangePalletNew extends BasePage {
title: '检查标准不能为空', title: '检查标准不能为空',
type: 'default', type: 'default',
}); });
this.isvalue = false;
return; return;
} }
console.log(this.formdata.orderCost); console.log(this.formdata.orderCost);

2
src/pages/login/login/index.vue
Unescape Escape View File

@ -143,7 +143,7 @@ export default class LoginPage extends BasePage {
} }
///********版本号修改区域********** ///********版本号修改区域**********
version = '0.0.73'; //正式版本号 version = '0.0.73'; //正式版本号
//version = '0.0.3'; //测试版本号 //version = '0.0.4'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true; //isTest = true;

20
src/utils/request.ts
Unescape Escape View File

@ -23,15 +23,15 @@ 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 if(config.url.includes('http')) { // }else if(config.url.includes('http')) {
//直接使用写死地址 // //直接使用写死地址
}else { // }else {
config.baseURL = 'http://192.168.202.34:30000' // config.baseURL = 'http://192.168.202.20:9000'
//'http://192.168.202.20:9000' ///测试 // //'http://192.168.202.20:9000' ///测试
//'http://192.168.202.34:30000'; //正式 // //'http://192.168.202.34:30000'; //正式
} // }
// 所有请求默认提示加载中 // 所有请求默认提示加载中
if (!loading) { if (!loading) {
uni.showLoading({ title: '加载中' }); uni.showLoading({ title: '加载中' });
@ -99,7 +99,7 @@ http.interceptors.response.use(
case 10: case 10:
return dataAxios; return dataAxios;
case 0: case 0:
return dataAxios; return dataAxios;
case 200: case 200:
return dataAxios; return dataAxios;
case 401: case 401:

Write Preview
Loading…
Cancel
Save