diff --git a/common/style/new_style.css b/common/style/new_style.css index 8c45d000..e11f5470 100644 --- a/common/style/new_style.css +++ b/common/style/new_style.css @@ -497,7 +497,7 @@ uni-page-head .uni-page-head__title { } .popup_box .pop_tab .tab_info textarea { - height: 280rpx; + height: 320rpx; } .popup_box .pop_tab .tab_info .uni-textarea-placeholder { diff --git a/mycomponents/job/jobPersonInfo.vue b/mycomponents/job/jobPersonInfo.vue index 7c1be5d6..fa28ee10 100644 --- a/mycomponents/job/jobPersonInfo.vue +++ b/mycomponents/job/jobPersonInfo.vue @@ -8,7 +8,7 @@ 承接时间 : - {{dataContent.acceptTime}} + {{dateFormat(dataContent.acceptTime)}} 创建人 : @@ -16,7 +16,7 @@ 创建时间 : - {{dataContent.createTime}} + {{dateFormat(dataContent.createTime)}} 完成人 : @@ -24,7 +24,7 @@ 完成时间 : - {{dataContent.completeTime}} + {{dateFormat(dataContent.completeTime)}} @@ -32,6 +32,8 @@ diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue index 315e97ed..9616a0f8 100644 --- a/mycomponents/scan/winComScan.vue +++ b/mycomponents/scan/winComScan.vue @@ -10,10 +10,10 @@ @input="handelScanMsg" :cursor="cursorIndex"> - - + + diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue index 70f20728..1b2bc367 100644 --- a/pages/issue/coms/comScanIssuePack.vue +++ b/pages/issue/coms/comScanIssuePack.vue @@ -157,6 +157,8 @@ this.scanOptions = getDetailEditRemoveOption(); }, methods: { + + openScanPopup(content, jobcontent) { this.issueRecord = []; this.dataContent = content; @@ -178,7 +180,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses =this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = this.jobContent.outInventoryStatuses that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue index bfa938d5..83281c14 100644 --- a/pages/putaway/job/putawayDetail.vue +++ b/pages/putaway/job/putawayDetail.vue @@ -267,7 +267,7 @@ var locationCode = result.balance.locationCode; var inventoryStatus = result.balance.inventoryStatus; var detail = this.detailSource.find(r => r.itemCode == itemCode); - + if (detail == undefined) { this.showErrorMessage("物料号【" + itemCode + "】不在列表中") } else { diff --git a/static/config.json b/static/config.json index 1c570702..4f688e61 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.230:12080/admin-api", + "value": "http://dev.ccwin-in.com:25100/api/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",