From 4a64781fc9779723740ad6283f49114e77e77ac7 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Thu, 21 Sep 2023 11:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=9F=E6=9C=BA=E8=B0=83=E8=AF=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 4 +-- src/pages/mes/PalletChange/index.vue | 26 +++++++++++++---- src/pages/mes/PalletChange/model.ts | 2 +- src/pages/mes/ProductionQtyInsp/index.vue | 30 ++++++++++++++------ src/pages/mes/ProductionQtyInsp/listdata.vue | 9 +++--- src/pages/mes/ProductionQtyInsp/model.ts | 14 +++++---- src/utils/url.ts | 2 +- vue.config.js | 4 +-- 8 files changed, 60 insertions(+), 31 deletions(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index e56f85a..82162fc 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -21,7 +21,7 @@ class="input" @keyup.enter="EnterPress" v-model="form.username" - :placeholder="$t('message.PleaseInputUserName')" + placeholder="请输入账号" placeholder-style="color: rgba(255, 255, 255, 0.36)" :custom-style="{ height: '88rpx', @@ -48,7 +48,7 @@ class="input" @keyup.enter="EnterPress" v-model="form.password" - :placeholder="$t('message.PleaseInputPassword')" + placeholder="请输入密码" type="password" placeholder-style="color: rgba(255, 255, 255, 0.36)" :custom-style="{ diff --git a/src/pages/mes/PalletChange/index.vue b/src/pages/mes/PalletChange/index.vue index 90c98c1..f9b1829 100644 --- a/src/pages/mes/PalletChange/index.vue +++ b/src/pages/mes/PalletChange/index.vue @@ -12,20 +12,20 @@ rfid: - + - + - - + + @@ -58,6 +58,9 @@ import jPicker from '@/components/J-Picker/jPicker.vue'; }) export default class PalletChange extends BasePage { model = model; + moren = '选择缓存区'; + shouciFocus = true; + zaiciFocus = false; switchListText = [ { title: '置为正常', @@ -79,7 +82,7 @@ export default class PalletChange extends BasePage { // } orderNo: any = ''; location: any = ''; - locationStatus: any = 1; + locationStatus: any = -1; generateGUID() { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { var r = (Math.random() * 16) | 0, @@ -110,13 +113,24 @@ export default class PalletChange extends BasePage { reqTime: formattedDate, location: this.location, locationStatus: this.locationStatus, - productionState: '2', //this.productCodeList.value, + productionState: this.productCodeList.value, }; await this.model.palletInforUpdate(params); if (model.SubmitCode == 10) { this.uni.showToast({ title: '成功' }); + this.Clear(); } } + Clear() { + this.orderNo = ''; + this.location = ''; + this.locationStatus = -1; + this.productCodeList = {}; + this.shouciFocus = false; + this.$nextTick(() => { + this.shouciFocus = true; + }); + } switchChangeFun(e) { //console.log(e); this.locationStatus = e.swithcSelectItem.value; diff --git a/src/pages/mes/PalletChange/model.ts b/src/pages/mes/PalletChange/model.ts index 992bfef..345d43d 100644 --- a/src/pages/mes/PalletChange/model.ts +++ b/src/pages/mes/PalletChange/model.ts @@ -7,7 +7,7 @@ import { session } from '@/store/modules/session'; namespaced: true, dynamic: true, store, - name: 'page.raw.ingoods.SpareInbound.sparePartsShelves', + name: 'page.mes.PalletChange', }) export class PalletChange extends VuexModule { orderNoItemList: any = []; diff --git a/src/pages/mes/ProductionQtyInsp/index.vue b/src/pages/mes/ProductionQtyInsp/index.vue index 1d1da4e..02ec28e 100644 --- a/src/pages/mes/ProductionQtyInsp/index.vue +++ b/src/pages/mes/ProductionQtyInsp/index.vue @@ -12,10 +12,10 @@ rfid: - + - 扫描 + 查询 @@ -40,10 +40,10 @@ - + - - + + @@ -108,6 +108,8 @@ import { session } from '@/store/modules/session'; }) export default class productCheckReceipt extends BasePage { model = model; + moren = '选择缓存区'; + shouciFocus = true; // remove: any = {}; // async onReady() { // await this.model.queryLocation(); @@ -173,7 +175,8 @@ export default class productCheckReceipt extends BasePage { let imgUrlList: any = res.tempFilePaths; tempFilePaths.map((item, index) => { uni.uploadFile({ - url: '/api/dev-api/file/upload', + url: 'http://192.168.202.20:9000/prod-api/file/upload', + //url: '/dev-api/file/upload', fileType: 'image', filePath: item, header: { @@ -288,13 +291,22 @@ export default class productCheckReceipt extends BasePage { fileId: this.imgList.join(','), }; await this.model.OnSubmit(params); - if (this.model.SubmitCode == '1') { - this.customToast('质检成功！'); + if (this.model.SubmitCode == 200) { + // this.customToast('质检成功！'); + this.uni.showToast({ title: '质检成功' }); this.orderNo = ''; this.badMeg = ''; this.productCodeList = {}; + this.productLocList = {}; + this.imgUrlList = []; + this.imgList = []; this.model.empty(); - await this.query(); + this.shouciFocus = false; + this.$nextTick(() => { + this.shouciFocus = true; + }); + + //await this.query(); } } } diff --git a/src/pages/mes/ProductionQtyInsp/listdata.vue b/src/pages/mes/ProductionQtyInsp/listdata.vue index fa4406e..378c7f4 100644 --- a/src/pages/mes/ProductionQtyInsp/listdata.vue +++ b/src/pages/mes/ProductionQtyInsp/listdata.vue @@ -36,7 +36,7 @@ import model from './model'; jPicker, }, }) -export default class productCheckReceipt extends BasePage { +export default class ProductionQtyInsplist extends BasePage { model = model; rowdata: any = {}; headers = [ @@ -90,7 +90,7 @@ export default class productCheckReceipt extends BasePage { // selectItem(e: any) { // this.remove = e.pickerName; // } - onLoad() { + onShow() { this.query(); } changeContent(e) { @@ -116,9 +116,10 @@ export default class productCheckReceipt extends BasePage { } } async query() { - this.tableData = []; + //this.tableData = []; await this.model.queryhandChecklist(); - this.tableData = model.Checklist.rows; + //console.log('1234567', this.model.Checklist); + this.tableData = this.model.Checklist; this.tableData.map((item, index) => { item.index = index + 1; }); diff --git a/src/pages/mes/ProductionQtyInsp/model.ts b/src/pages/mes/ProductionQtyInsp/model.ts index 79eea3e..07d98f8 100644 --- a/src/pages/mes/ProductionQtyInsp/model.ts +++ b/src/pages/mes/ProductionQtyInsp/model.ts @@ -7,12 +7,12 @@ import { session } from '@/store/modules/session'; namespaced: true, dynamic: true, store, - name: 'page.raw.ingoods.SpareInbound.sparePartsShelves', + name: 'page.mes.ProductionQtyInsp', }) -export class wholeTransfer extends VuexModule { +export class ProductionQtyInsp extends VuexModule { rowdata: any; WlList = []; - Checklist: any = []; + // Checklist: any; orderNoItemList: any = []; productCodeList: any = []; @MutationAction @@ -27,17 +27,19 @@ export class wholeTransfer extends VuexModule { const orderNoItemList = result.data; return { orderNoItemList }; } + Checklist: any = []; @MutationAction async queryhandChecklist() { const result: any = await http.get(url.lanjumes.product.queryhandChecklist, { //loginName: session.loginName, params: { factoryCode: session.FactoryCode, - createBy: session.user?.createBy, + createBy: session.user?.loginName, }, }); - const Checklist = result; + const Checklist: any = result.rows; console.log('this.tableData', Checklist); + // debugger return { Checklist }; } SubmitCode: any = ''; @@ -77,4 +79,4 @@ export class wholeTransfer extends VuexModule { } } -export default getModule(wholeTransfer); +export default getModule(ProductionQtyInsp); diff --git a/src/utils/url.ts b/src/utils/url.ts index f26ad30..7a9b82c 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -const qianzhuione = '/prod-api'; // '/dev-api'开发环境 +const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 export const url = { wmspda: { system: { diff --git a/vue.config.js b/vue.config.js index 2ef90ab..7a6837b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -10,8 +10,8 @@ module.exports = { // }, }, '/dev-api': { - //target: 'http://192.168.3.93:81', - target: 'http://192.168.202.20:9000', + target: 'http://192.168.3.93:81', + //target: 'http://192.168.202.20:9000', changeOrigin: true, // pathRewrite: { // '^/dev-api': '',