diff --git a/src/pages/equipment/SparepartsInto/index.vue b/src/pages/equipment/SparepartsInto/index.vue index c010fc6..2a391f5 100644 --- a/src/pages/equipment/SparepartsInto/index.vue +++ b/src/pages/equipment/SparepartsInto/index.vue @@ -102,7 +102,7 @@ export default class SparepartsInto extends BasePage { { required: true, message: '库存不能为空', - trigger: ['change', 'blur'], + trigger: ['change'], }, ], quantity: [ @@ -171,12 +171,12 @@ export default class SparepartsInto extends BasePage { } } async onsubmit() { - (this.$refs.uForm as any).setRules(this.rules); + //(this.$refs.uForm as any).setRules(this.rules); (this.$refs.uForm as any).validate(async (valid) => { if (valid) { let query = { - spareCode: this.formdata.spareCode, - spareName: this.formdata.spareName, + spareCode: this.formdata.materialCode, + spareName: this.formdata.materialDesc, amount: this.formdata.quantity, storageId: this.formdata.storageId, inOutType: 'type_in', diff --git a/src/pages/equipment/SparepartsInto/model.ts b/src/pages/equipment/SparepartsInto/model.ts index c11f93c..d47c0cb 100644 --- a/src/pages/equipment/SparepartsInto/model.ts +++ b/src/pages/equipment/SparepartsInto/model.ts @@ -24,10 +24,11 @@ export class SparepartsInto extends VuexModule { // 巡检:inspection // 保养:maintenance async sparePartsInOutStorage(query: any) { - const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, { + const result: any = await http.post( + url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, + query, //loginName: session.loginName, - params: query, - }); + ); const SubmitCode: [] = result; return { SubmitCode }; } diff --git a/src/pages/equipment/SparepartsIntoOut/index.vue b/src/pages/equipment/SparepartsIntoOut/index.vue index 2c21df0..64b5cff 100644 --- a/src/pages/equipment/SparepartsIntoOut/index.vue +++ b/src/pages/equipment/SparepartsIntoOut/index.vue @@ -16,15 +16,15 @@ - - + + - - + + - + @@ -100,9 +100,9 @@ export default class SparepartsInto extends BasePage { ], amount: [ { - required: false, + required: true, message: '库存不能为空', - trigger: ['change', 'blur'], + trigger: ['change'], }, ], quantity: [ @@ -171,12 +171,12 @@ export default class SparepartsInto extends BasePage { } } async onsubmit() { - (this.$refs.uForm as any).setRules(this.rules); + //(this.$refs.uForm as any).setRules(this.rules); (this.$refs.uForm as any).validate(async (valid) => { if (valid) { let query = { - spareCode: this.formdata.spareCode, - spareName: this.formdata.spareName, + spareCode: this.formdata.materialCode, + spareName: this.formdata.materialDesc, amount: this.formdata.quantity, storageId: this.formdata.storageId, inOutType: 'type_out', diff --git a/src/pages/equipment/SparepartsIntoOut/model.ts b/src/pages/equipment/SparepartsIntoOut/model.ts index c11f93c..d47c0cb 100644 --- a/src/pages/equipment/SparepartsIntoOut/model.ts +++ b/src/pages/equipment/SparepartsIntoOut/model.ts @@ -24,10 +24,11 @@ export class SparepartsInto extends VuexModule { // 巡检:inspection // 保养:maintenance async sparePartsInOutStorage(query: any) { - const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, { + const result: any = await http.post( + url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, + query, //loginName: session.loginName, - params: query, - }); + ); const SubmitCode: [] = result; return { SubmitCode }; } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index ed102a0..f41ec7c 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.73'; //正式版本号 + version = '0.0.74'; //正式版本号 //version = '0.0.4'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/utils/url.ts b/src/utils/url.ts index 14e1d73..9ebc934 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -218,7 +218,7 @@ export const url = { SparepartsInto: { // 获取备品备件信息 querySpareDetailBySpareCode: qianzhuione + '/device/devicePDA/querySpareDetailBySpareCode/', - sparePartsInOutStorage: qianzhuione + '/devicePDA/sparePartsInOutStorage', + sparePartsInOutStorage: qianzhuione + '/device/devicePDA/sparePartsInOutStorage', }, // 备件备品入库 SparepartsIntoOut: {},