UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter

Browse Source
20240912_adapter
zane 1 year ago
parent 9f56d4f294 5bbcf2e7f1
commit faf615eeee
7 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
src/api/collect/collectOrder.js
Unescape Escape View File

@ -222,7 +222,7 @@ export function orderFinish(query) {
return axios({ return axios({
url: "/udiwms/basic/collect/orderFinish/filter", url: "/udiwms/basic/collect/orderFinish/filter",
method: "get", method: "get",
data: query params: query
}); });
} }

1
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -822,6 +822,7 @@ export default {
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
this.panelALive = false
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",

2
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -1124,7 +1124,7 @@ export default {
this.$refs.childRef.getDraftList(); this.$refs.childRef.getDraftList();
this.$refs.childRef.getOtherList(); this.$refs.childRef.getOtherList();
this.$message.warning(res.message) this.$message.warning(res.message)
this.refreshCodesPanel(this);
} }
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false

12
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -1620,8 +1620,10 @@ export default {
}, },
handleChoose(currentRow) { handleChoose(currentRow) {
this.orderQuery = currentRow this.orderQuery = currentRow
this.chooseDraftOrderVisible = false
this.refreshOrder(this.orderQuery)
//选入单据 判断此订单是否正在处理中 //选入单据 判断此订单是否正在处理中
this.upOrderStatus() // this.upOrderStatus()
}, },
upOrderStatus(){ upOrderStatus(){
@ -1630,8 +1632,7 @@ export default {
} }
upProcessing(query).then(res => { upProcessing(query).then(res => {
if (res.code == 20000){ if (res.code == 20000){
this.chooseDraftOrderVisible = false
this.refreshOrder(this.orderQuery)
}else if (res.code == 501){ }else if (res.code == 501){
this.$message.error("当前单据正在处理中，请重新选择单据") this.$message.error("当前单据正在处理中，请重新选择单据")
this.$refs.chooseDraftOrder.getList(); this.$refs.chooseDraftOrder.getList();
@ -2012,7 +2013,8 @@ export default {
this.orderFormData.inoutType = 1 this.orderFormData.inoutType = 1
else else
this.orderFormData.inoutType = 2 this.orderFormData.inoutType = 2
// this.orderFormData.inoutType = this.splitType; // this.orderFormData.inoutType = this.splitType; orderType
this.orderFormData.orderType = 2
batchAddCode(this.orderFormData).then((res) => { batchAddCode(this.orderFormData).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
if (res.data.orderId != null) if (res.data.orderId != null)
@ -2132,7 +2134,7 @@ export default {
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId); this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
this.orderFormData.splitBusType = "YPCF002" this.orderFormData.splitBusType = "YPCF002"
//查找当前用户工位是否有正在处理的单据 //查找当前用户工位是否有正在处理的单据
this.getOrder() // this.getOrder()
} else { } else {
if (this.orderQuery.workPlaceCode != null) { if (this.orderQuery.workPlaceCode != null) {
this.orderFormData.workPlaceCode = String(this.orderQuery.workPlaceCode); this.orderFormData.workPlaceCode = String(this.orderQuery.workPlaceCode);

62
src/views/collect/PanelOrderManuTagCode.vue
Unescape Escape View File

@ -116,7 +116,7 @@
:total="codeTotal" :total="codeTotal"
:limit.sync="codeQuery.limit" :limit.sync="codeQuery.limit"
:page.sync="codeQuery.page" :page.sync="codeQuery.page"
@pagination="getList(this)" @pagination="getList"
></pagination> ></pagination>
</div> </div>
@ -212,7 +212,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("操作成功！"); this.$message.success("操作成功！");
// this.refreshPanel(this) // this.refreshPanel(this)
this.getList(this); this.getList();
this.closeScanDialog() this.closeScanDialog()
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
@ -239,47 +239,48 @@ export default {
this.query.sort = 'asc' this.query.sort = 'asc'
} }
this.query.orderBy = column.prop; this.query.orderBy = column.prop;
this.getList(this); this.getList();
}, },
///界面配置相关------------end ///界面配置相关------------end
getList(_this) { getList() {
if (_this.prescribeData == null) if (this.prescribeData == null)
return return
if (_this.prescribeData != null) { if (this.prescribeData != null) {
_this.codeQuery.page = 1 // this.codeQuery.page = 1
_this.codeQuery.orderIdFk = this.prescribeData.billNo this.codeQuery.orderIdFk = this.prescribeData.billNo
_this.codeQuery.bizIdFk = this.bizId this.codeQuery.bizIdFk = this.bizId
} }
_this.codeLoading = true; this.codeLoading = true;
if (_this.fifoSplit == 3) { if (this.fifoSplit == 3) {
manualCodeDetail(_this.codeQuery).then(res => { manualCodeDetail(this.codeQuery).then(res => {
_this.codeLoading = false this.codeLoading = false
if (res.code != 20000) { if (res.code != 20000) {
_this.$message.error(res.message) this.$message.error(res.message)
return return
} }
_this.codeDetailList = res.data.list this.codeDetailList = res.data.list
_this.codeTotal = res.data.total || 0 this.codeTotal = res.data.total || 0
_this.codeLoading = false this.codeLoading = false
}).catch(() => { }).catch(() => {
_this.codeLoading = false this.codeLoading = false
_this.codeTotal = res.data.total || 0 this.codeTotal = res.data.total || 0
_this.$message.error("数据加载失败") this.$message.error("数据加载失败")
}) })
} else { } else {
_this.codeQuery.fifoSplit = this.fifoSplit this.codeQuery.fifoSplit = this.fifoSplit
autoCodeResult(_this.codeQuery).then(res => { autoCodeResult(this.codeQuery).then(res => {
_this.codeLoading = false this.codeLoading = false
if (res.code != 20000) { if (res.code != 20000) {
_this.$message.error(res.message) this.$message.error(res.message)
return return
} }
_this.codeDetailList = res.data.list this.codeDetailList = res.data.list
_this.codeLoading = false this.codeTotal = res.data.total || 0
this.codeLoading = false
}).catch(() => { }).catch(() => {
_this.codeLoading = false this.codeLoading = false
_this.$message.error("数据加载失败") this.$message.error("数据加载失败")
}) })
} }
@ -319,7 +320,6 @@ export default {
if (this.fifoSplit == 2 || this.fifoSplit == 1) { if (this.fifoSplit == 2 || this.fifoSplit == 1) {
this.splitType = false this.splitType = false
} }
if (this.tableHeader2 == null || this.tableHeader2.length == 0) { if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
getHead("PanelOrderManuTagCode", "1").then((re) => { getHead("PanelOrderManuTagCode", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
@ -327,10 +327,10 @@ export default {
this.tableHeader2 = re.data.tableList; this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList; this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList; this.fromList2 = re.data.fromList;
this.getList(this); this.getList();
}); });
} else { } else {
this.getList(this); this.getList();
} }

2
src/views/collect/PanelOrderUpload.vue
Unescape Escape View File

@ -378,7 +378,7 @@ export default {
filterQuery: { filterQuery: {
busType: null, busType: null,
tagStatus: null, tagStatus: null,
uploadStatus: null, uploadStatus: 1,
billNo: null, billNo: null,
workPlaceCode: null, workPlaceCode: null,
page: 1, page: 1,

9
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -543,7 +543,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
excludeWorkCode: null, excludeWorkCode: null,
tagStatusList: [0, 1, -1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态 // tagStatusList: [0, 1, -1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
// invAlerts:[0,1] // invAlerts:[0,1]
}, },
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
@ -642,7 +642,7 @@ export default {
this.filterQuery.startTime = null; this.filterQuery.startTime = null;
this.filterQuery.endTime = null; this.filterQuery.endTime = null;
} }
this.filterQuery.workPlaceCode = null
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = null this.filterQuery.excludeWorkCode = null
@ -665,6 +665,7 @@ export default {
this.panelALive = false this.panelALive = false
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
this.filterQuery.excludeWorkCode = null this.filterQuery.excludeWorkCode = null
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.tagStatus = -1 this.filterQuery.tagStatus = -1
orderPage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
@ -675,14 +676,16 @@ export default {
this.loading = false this.loading = false
this.draftList = [] this.draftList = []
this.draftTotal = 0 this.draftTotal = 0
}) })
}, },
getOtherList() { getOtherList() {
this.panelALive = false this.panelALive = false
this.loading = true; this.loading = true;
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
this.filterQuery.workPlaceCode = null
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = this.workPlaceCode this.filterQuery.excludeWorkCode = this.$route.query.workplaceId
this.filterQuery.tagStatus = -2 this.filterQuery.tagStatus = -2
orderPage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false

Write Preview
Loading…
Cancel
Save