diff --git a/.env.development b/.env.development
index a216fad1..9bf7280a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
+VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
# 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境
VITE_isDevelopment=true
# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index ddd52d52..0940fbe1 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -22,7 +22,7 @@
-
+
@@ -79,14 +79,14 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- scanMessage:""
+ scanMessage: ""
};
},
props: {
- type: 'assemble',
- title:{
- required:false,
- default:''
+ type: 'assemble',
+ title: {
+ required: false,
+ default: ''
}
},
@@ -130,13 +130,13 @@
}
},
- methods: {
- onReach() {
- //避免多次触发
- if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
- return;
- }
- this.getList("more");
+ methods: {
+ onReach() {
+ //避免多次触发
+ if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+ return;
+ }
+ this.getList("more");
},
toHome() {
goHome()
@@ -173,11 +173,11 @@
action: "in",
value: this.status
})
-
- filters.push({
- column: "accept_user_id",
- action: "==",
- value: this.$store.state.user.id
+
+ filters.push({
+ column: "accept_user_id",
+ action: "==",
+ value: this.$store.state.user.id
})
filters.push({
column: "type",
@@ -199,7 +199,7 @@
var list = res.data.list;
this.totalCount = res.data.total
this.loadingType = "loadmore";
- updateTitle(this.title+"(" + this.totalCount + ")");
+ updateTitle(this.title + "(" + this.totalCount + ")");
if (list == null || list.length == 0) {
this.loadingType = "nomore";
return;
@@ -211,8 +211,8 @@
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
- }
- updateTitle(this.title+"(" + this.totalCount + ")");
+ }
+ updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -221,9 +221,10 @@
openJobDetail(item, scanMessage = '') {
uni.navigateTo({
- url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item.type + '&scanMessage=' + this.scanMessage +'&title='+this.title
+ url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
+ .type + '&scanMessage=' + this.scanMessage + '&title=' + this.title
});
- this.scanMessage=""
+ this.scanMessage = ""
},
showItemList(itemList) {
@@ -337,11 +338,17 @@
},
getScanResult(result) {
try {
- this.scanMessage =""
- var filters = [{
+ this.scanMessage = ""
+ var filters = [
+ // {
+ // column: "packingNumber",
+ // action: "==",
+ // value: result.label.packingNumber
+ // },
+ {
column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
},
{
column: "batch",
@@ -357,16 +364,16 @@
column: "itemCode",
action: "==",
value: result.label.itemCode
- },
- {
- column: "type",
- action: "==",
- value: this.type
- },
- {
- column: "status",
- action: "in",
- value: '1,2',
+ },
+ {
+ column: "type",
+ action: "==",
+ value: this.type
+ },
+ {
+ column: "status",
+ action: "in",
+ value: '1,2',
},
{
column: "accept_user_id",
@@ -384,19 +391,19 @@
pageNo: 1,
pageSize: 100,
}).then(res => {
- this.scanMessage =result.scanMessage
+ this.scanMessage = result.scanMessage
let resultList = res.data.list;
- if (resultList.length > 0) {
- resultList.forEach(item => {
- item.title = item.number;
- item.selected = false
- })
- let list = []
- resultList.forEach(item=>{
- if(!list.find(subItem=>subItem.title==item.title)){
- list.push(item)
- }
- })
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
+ item.title = item.number;
+ item.selected = false
+ })
+ let list = []
+ resultList.forEach(item => {
+ if (!list.find(subItem => subItem.title == item.title)) {
+ list.push(item)
+ }
+ })
console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
@@ -404,10 +411,10 @@
this.selectItem(list[0])
}
} else {
- this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]")
+ this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]")
}
}).catch(error => {
- this.showMessage(error+"
扫描["+result.scanMessage+"]")
+ this.showMessage(error + "
扫描[" + result.scanMessage + "]")
})
} catch (e) {
diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue
index ee993c3b..d190d8ab 100644
--- a/src/pages/productReceipt/job/ccProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@@ -80,8 +80,8 @@
detailOptions: [],
detailGiveupOptions: [],
type: 'assemble',
- title:"",
- scanMessage:""
+ title: "",
+ scanMessage: ""
};
},
// 装配收货：type = 'assemble'
@@ -92,12 +92,12 @@
// default: ''
// },
// },
-
- onLoad(option){
+
+ onLoad(option) {
this.title = option.title
},
-
- onShow(){
+
+ onShow() {
this.detailOptions = getDetailOption();
this.detailGiveupOptions = getDetailGiveupOption();
this.getList('refresh');
@@ -126,7 +126,7 @@
this.$refs.filter.openFilter();
}
},
-
+
onReachBottom() {
console.log('onReachBottom', this.loadingType)
//避免多次触发
@@ -211,10 +211,11 @@
openJobDetail(item, scanMessage = '') {
uni.navigateTo({
- url: './ccProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
+ url: './ccProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+ '&scanMessage=' +
scanMessage + '&title=' + this.title
});
- this.scanMessage =""
+ this.scanMessage = ""
// if (this.type == 'predict') {
// uni.navigateTo({
// url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
@@ -348,11 +349,17 @@
},
getScanResult(result) {
try {
- this.scanMessage =""
- var filters = [{
+ this.scanMessage = ""
+ var filters = [
+ // {
+ // column: "packingNumber",
+ // action: "==",
+ // value: result.label.packingNumber
+ // },
+ {
column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
},
{
column: "batch",
@@ -390,7 +397,7 @@
pageNo: 1,
pageSize: 100,
}).then(res => {
- this.scanMessage =result.scanMessage
+ this.scanMessage = result.scanMessage
let resultList = res.data.list;
if (resultList.length > 0) {
resultList.forEach(item => {
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 4f43db4c..2e904488 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -21,7 +21,7 @@
-
+
@@ -79,16 +79,16 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- scanMessage:""
+ scanMessage: ""
};
},
// 装配收货：type = 'assemble'
// 预生产收货：type = 'predict'
props: {
- type: 'assemble',
- title: {
- type: String,
- default: ''
+ type: 'assemble',
+ title: {
+ type: String,
+ default: ''
},
},
@@ -99,7 +99,7 @@
this.getList('refresh');
},
-
+
onPullDownRefresh() {
this.getList('refresh');
@@ -125,14 +125,14 @@
}
},
- methods: {
- onReachBottom() {
- console.log('onReachBottom',this.loadingType)
- //避免多次触发
- if (this.loadingType == 'loading' || this.loadingType == 'noMore') {
- return;
- }
- this.getList("more");
+ methods: {
+ onReachBottom() {
+ console.log('onReachBottom', this.loadingType)
+ //避免多次触发
+ if (this.loadingType == 'loading' || this.loadingType == 'noMore') {
+ return;
+ }
+ this.getList("more");
},
refresh() {
this.getList('refresh');
@@ -161,11 +161,11 @@
column: "status",
action: "in",
value: this.status
- })
- filters.push({
- column: "accept_user_id",
- action: "==",
- value: this.$store.state.user.id
+ })
+ filters.push({
+ column: "accept_user_id",
+ action: "==",
+ value: this.$store.state.user.id
})
filters.push({
column: "type",
@@ -187,8 +187,8 @@
var list = res.data.list;
this.totalCount = res.data.total
- // 预生产收货任务 装配收货任务 报废收货任务
- updateTitle(this.title+"(" + this.totalCount + ")");
+ // 预生产收货任务 装配收货任务 报废收货任务
+ updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "more";
if (list == null || list.length == 0) {
this.loadingType = "noMore";
@@ -202,7 +202,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle(this.title+"(" + this.totalCount + ")");
+ updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -212,18 +212,21 @@
openJobDetail(item, scanMessage = '') {
if (this.type == 'predict') {
uni.navigateTo({
- url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+ url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+ '&scanMessage=' + scanMessage + '&title=' + this.title
});
} else if (this.type == 'assemble') {
uni.navigateTo({
- url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+ url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+ '&scanMessage=' + scanMessage + '&title=' + this.title
});
} else {
uni.navigateTo({
- url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+ url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+ '&scanMessage=' + scanMessage + '&title=' + this.title
});
}
- this.scanMessage =""
+ this.scanMessage = ""
},
showItemList(itemList) {
@@ -349,11 +352,11 @@
},
getScanResult(result) {
try {
- this.scanMessage =""
+ this.scanMessage = ""
var filters = [{
column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
},
{
column: "batch",
@@ -369,16 +372,16 @@
column: "itemCode",
action: "==",
value: result.label.itemCode
- },
- {
- column: "type",
- action: "==",
- value: this.type
- },
- {
- column: "status",
- action: "in",
- value: '1,2',
+ },
+ {
+ column: "type",
+ action: "==",
+ value: this.type
+ },
+ {
+ column: "status",
+ action: "in",
+ value: '1,2',
},
{
column: "accept_user_id",
@@ -391,29 +394,29 @@
pageNo: 1,
pageSize: 100,
}).then(res => {
- this.scanMessage =result.scanMessage
+ this.scanMessage = result.scanMessage
let resultList = res.data.list;
- if (resultList.length > 0) {
- resultList.forEach(item => {
- item.title = item.number;
- item.selected = false
- })
- let list = []
- resultList.forEach(item=>{
- if(!list.find(subItem=>subItem.title==item.title)){
- list.push(item)
- }
- })
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
+ item.title = item.number;
+ item.selected = false
+ })
+ let list = []
+ resultList.forEach(item => {
+ if (!list.find(subItem => subItem.title == item.title)) {
+ list.push(item)
+ }
+ })
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
this.selectItem(list[0])
}
} else {
- this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]")
+ this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]")
}
}).catch(error => {
- this.showMessage(error+"
扫描["+result.scanMessage+"]")
+ this.showMessage(error + "
扫描[" + result.scanMessage + "]")
})
} catch (e) {
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index e678bfad..d484d78a 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -391,10 +391,10 @@
}]
} else {
filters = [{
- column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
- },
+ column: "packingNumber",
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
+ },
{
column: "batch",
action: "==",
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index cc18b893..314dc5a0 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -482,6 +482,7 @@
this.managementList = res.list;
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
+ return;
putawayJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 60733308..389d8ea2 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -56,7 +56,9 @@
import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
-import { Exception } from 'sass';
+ import {
+ Exception
+ } from 'sass';
export default {
name: 'Putaway',
@@ -83,18 +85,18 @@ import { Exception } from 'sass';
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- title:'',
- scanMessage:""
+ title: '',
+ scanMessage: ""
};
},
-
- onLoad(option){
+
+ onLoad(option) {
this.title = option.title
},
onShow() {
this.getList('refresh');
-
+
},
onReady() {
@@ -179,7 +181,7 @@ import { Exception } from 'sass';
var list = res.data.list;
this.totalCount = res.data.total
- updateTitle(this.title+"(" + this.totalCount + ")");
+ updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "loadmore";
if (list == null || list.length == 0) {
this.loadingType = "nomore";
@@ -201,9 +203,9 @@ import { Exception } from 'sass';
openJobDetail(item) {
uni.navigateTo({
- url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + '&title='+this.title
+ url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + '&title=' + this.title
});
- this.scanMessage=""
+ this.scanMessage = ""
},
showItemList(itemList) {
@@ -279,7 +281,7 @@ import { Exception } from 'sass';
action: "==",
value: code
})
-
+
filters.push({
column: "accept_user_id",
action: "==",
@@ -318,27 +320,27 @@ import { Exception } from 'sass';
selectItem(item) {
this.$refs.scanPopup.closeScanPopup();
uni.navigateTo({
- url: './putawayDetail?id='
- + item.masterId
- + '&status=' + item.status
- +'&scaned='+item.packingNumber
- + '&title='+this.title
- +"&scanMessage="+this.scanMessage
+ url: './putawayDetail?id=' +
+ item.masterId +
+ '&status=' + item.status +
+ '&scaned=' + item.packingNumber +
+ '&title=' + this.title +
+ "&scanMessage=" + this.scanMessage
});
- this.scanMessage=""
+ this.scanMessage = ""
},
getScanResult(result) {
try {
- this.scanMessage =""
+ this.scanMessage = ""
var filters = [{
column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
},
{
column: "batch",
action: "==",
- value: result.label.batch
+ value: result.package.batch
},
// {
// column: "qty",
@@ -348,12 +350,12 @@ import { Exception } from 'sass';
{
column: "itemCode",
action: "==",
- value: result.label.itemCode
+ value: result.package.itemCode
},
{
column: "status",
action: "in",
- value: '1,2,3',
+ value: '1,2',
},
// {
// column: "accept_user_id",
@@ -371,7 +373,7 @@ import { Exception } from 'sass';
pageNo: 1,
pageSize: 100,
}).then(res => {
- this.scanMessage =result.scanMessage
+ this.scanMessage = result.scanMessage
let resultList = res.data.list;
if (resultList.length > 0) {
resultList.forEach(item => {
@@ -379,38 +381,40 @@ import { Exception } from 'sass';
item.selected = false
})
let list = []
- resultList.forEach(item=>{
- if(!list.find(subItem=>subItem.title==item.title)){
+ resultList.forEach(item => {
+ if (!list.find(subItem => subItem.title == item.title)) {
list.push(item)
}
})
- if(list.length==1){
- //待处理
- if(list[0].status==1){
- this.selectItem(list[0])
- }else if(list[0].status==2){
- //进行中
- if(list[0].acceptUserId==this.$store.state.user.id){
- this.selectItem(list[0])
- }else {
- this.showMessage("该任务已经被["+list[0].acceptUserName+"]承接"+"
任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
- }
- }else if(list[0].status==3){
- this.showMessage("该任务已经完成
承接人["+list[0].acceptUserName+"]
任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
- }
- }else {
- this.showMessage("查询到多条任务
"+"扫描["+result.scanMessage+"]")
+ if (list.length == 1) {
+ //待处理
+ if (list[0].status == 1) {
+ this.selectItem(list[0])
+ } else if (list[0].status == 2) {
+ //进行中
+ if (list[0].acceptUserId == this.$store.state.user.id) {
+ this.selectItem(list[0])
+ } else {
+ this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "
任务号[" +
+ list[0].number + "]扫描[" + result.scanMessage + "]")
+ }
+ } else if (list[0].status == 3) {
+ this.showMessage("该任务已经完成
承接人[" + list[0].acceptUserName + "]
任务号[" +
+ list[0].number + "]扫描[" + result.scanMessage + "]")
+ }
+ } else {
+ this.showMessage("查询到多条任务
" + "扫描[" + result.scanMessage + "]")
}
-
+
} else {
- this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]")
+ this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]")
}
}).catch(error => {
- this.showMessage(error+"
扫描["+result.scanMessage+"]")
+ this.showMessage(error + "
扫描[" + result.scanMessage + "]")
})
} catch (e) {
- this.showMessage(e+"
扫描["+result.scanMessage+"]")
+ this.showMessage(e + "
扫描[" + result.scanMessage + "]")
}
},
}