diff --git a/src/api/request2.js b/src/api/request2.js index f654afbd..8dc5ef33 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -19,7 +19,7 @@ export function getCaptchaImage(params) { */ export function login(username, password, code, uuid, tenantName) { return request({ - url: baseApi + '/system/auth/login', + url: baseApi + '/system/auth/loginNoCode', headers: { isToken: false }, diff --git a/src/manifest.json b/src/manifest.json index 3da3f3cc..5230d74c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,10 +1,10 @@ { "name" : "wms", "package" : "uni.UNI43932FE", - "appid" : "__UNI__F36DDCF", + "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.63", - "versionCode" : 63, + "versionName" : "1.0.64", + "versionCode" : 64, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index e958c8d4..d7504bf6 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -434,7 +434,7 @@ balance: item, fromLocationCode: this.fromLocationCode, } - // this.packGetFocus(); + this.packGetFocus(); this.$emit("getResult", data); }, diff --git a/src/pages.json b/src/pages.json index 65cde9c4..fa471c6d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -458,6 +458,45 @@ "enablePullDownRefresh": false } }, + + { + "path": "pages/putaway/job/quantityPutawayJob", + "style": { + "navigationBarTitleText": "采购上架(批量)", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] + } + } + }, + + { + "path": "pages/putaway/job/quantityPutawayJobDetail", + "style": { + "navigationBarTitleText": "采购上架(批量)详情", + "enablePullDownRefresh": false + } + }, + + { "path": "pages/putaway/record/putawayRecord", "style": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8fb3b6c7..1fa86ce7 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -388,7 +388,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; + var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 690ddbff..161473dc 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -392,7 +392,7 @@ let hint="" this.dataContent.subList.forEach(res=>{ if(res.fromLocationCode==res.toLocationCode&& - res.fromInventoryStatus&&res.toInventoryStatus){ + res.fromInventoryStatus==res.toInventoryStatus){ hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` } }) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 50420dd7..71ac4b30 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -65,13 +65,13 @@ - + - + @@ -119,7 +119,8 @@ imageSrc: "", code: "", uuid: "", - version: "" + version: "", + needCode:false } }, // computed: mapState(['forcedLogin', 'hasLogin']), @@ -185,13 +186,15 @@ icon: 'none', mask: true }) - } else if (this.code === '') { + } + else if (this.needCode&&this.code === '') { uni.showToast({ title: '验证码不能为空', icon: 'none', mask: true }) - } else { + } + else { // console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg) let logininfo = { username: "", diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index dab39818..baefd393 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -5,10 +5,11 @@ 检验指引单 上架指引单 - + - - Q + + Q @@ -35,8 +36,14 @@ - - + + + + + + + +
抽检数量 {{item.sampleQty}}
未生成检验申请
未生成检验申请
没有检验方案
检验阶段不存在
@@ -123,7 +130,7 @@ currentPage1: 1, pageSize1: 20, number: '', - isHaveOn: false,//显示上架指引单 + isHaveOn: false, //显示上架指引单 // isHaveInspect:false,//显示检验指引单 } }, @@ -201,83 +208,52 @@ this.readFile(htmlFileUrl1, (htmlContent) => { this.newHtmlContent1 = htmlContent this.data1.inspectDTOList.forEach(item => { - if(!item.haveInspectionRequest){ - str += ` -

-
-
Q
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
未生成检验申请
-
-
- ` - }else{ - str += ` -

-
-
Q
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
-
-
- ` + let str1 = ` +

+
+
Q
+ + + + + + + + + + + + + + + + + + + + + + + + + + + ` + let str2 = `` + if(item.haveInspectionRequest==='0'){ + str2 =`` + }else if(item.haveInspectionRequest==='2'){ + str2 =`` + }else if(item.haveInspectionRequest==='3'){ + str2 =`` } - + let str3 = ` + +
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
未生成检验申请
没有检验方案
检验阶段不存在
+
+
+ ` + str += str1 + str2+ str3 }) this.newHtmlContent1 = this.newHtmlContent1.replace( "mainBody", str); //替换物品代码 @@ -318,7 +294,7 @@ showMessage(message) { this.$refs.comMessage.showMessage(message, res => { if (res) { - + } }); }, @@ -346,7 +322,7 @@ }, async onShow() { // 获取上架指引单 - if(this.data.ids){ + if (this.data.ids) { await getJimuPutawayJobDetail({ masterIds: this.data.ids }).then(res => { @@ -355,27 +331,26 @@ }) } // 获取采购收货指引单 - if(this.number){ + if (this.number) { await queryInspectionFreeFlag({ - number: this.number - }).then(async res1 => { - console.log(444,res1) - this.data1 = res1.data - this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0) - if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){ - this.tabIndex =2 - } - this.getTableInspectDTOList() - }) - .catch(error=>{ - this.$refs.comMessage.showMessage(error, res => { - if (res) { - + number: this.number + }).then(async res1 => { + this.data1 = res1.data + this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty >0) + if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) { + this.tabIndex = 2 } - }); - }) + this.getTableInspectDTOList() + }) + .catch(error => { + this.$refs.comMessage.showMessage(error, res => { + if (res) { + + } + }); + }) } - + this.getPointPutawayJobHtml() this.getPurchaseReceiptJobHtml() }, @@ -531,11 +506,13 @@ td { padding: 10px; - &:nth-child(2n){ - width:290rpx; + + &:nth-child(2n) { + width: 290rpx; } - &:nth-child(2n+1){ - width:160rpx; + + &:nth-child(2n+1) { + width: 160rpx; } } @@ -563,17 +540,18 @@ border-bottom: 4rpx solid rgb(60, 156, 255); } } - .relative{ + + .relative { margin-bottom: 20rpx; position: relative; } - - .q{ + + .q { position: absolute; left: 50%; - top:50%; + top: 50%; font-size: 400rpx; - transform: translate(-50% ,-50%); + transform: translate(-50%, -50%); color: rgba(0, 0, 0, 0.1); } \ No newline at end of file diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 1c98771d..d3362b7d 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -1,10 +1,10 @@