diff --git a/src/router/views/index.js b/src/router/views/index.js index db7f3ee..8ea84ea 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -166,6 +166,36 @@ export default [ }, ], }, + { + path: '/retrospectDefend', + component: Layout, + redirect: '/retrospectDefend/index', + children: [ + { + path: 'index', + component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/retrospectDefend/index.vue'), + name: '生产追溯维护', + meta: { + i18n: 'info', + }, + }, + ], + }, + { + path: '/eleFilesEdit', + component: Layout, + redirect: '/eleFilesEdit/index', + children: [ + { + path: 'index', + component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/eleFilesEdit/index.vue'), + name: '电子档案维护', + meta: { + i18n: 'info', + }, + }, + ], + }, { path: '/work/process/leave', diff --git a/src/views/logisticsManagement/components/addPackingDialog.vue b/src/views/logisticsManagement/components/addPackingDialog.vue index 541e419..7331b84 100644 --- a/src/views/logisticsManagement/components/addPackingDialog.vue +++ b/src/views/logisticsManagement/components/addPackingDialog.vue @@ -94,7 +94,12 @@ export default { getQuantityLocation({ boxBarcode: this.form.boxBarcode }).then(res => { this.formLoading = true; this.boxBarInfo = res.data.data; - this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo); + if(res.data.data.yieldOrderList!= null ){ + this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo); + }else{ + this.orderIdList = [] + } + setTimeout(() => { this.$message.success('箱条码获取数据成功!'); this.formLoading = false; diff --git a/src/views/logisticsManagement/components/returnDialog.vue b/src/views/logisticsManagement/components/returnDialog.vue index d31d842..711d977 100644 --- a/src/views/logisticsManagement/components/returnDialog.vue +++ b/src/views/logisticsManagement/components/returnDialog.vue @@ -22,7 +22,8 @@ /> - + + 暂无可配送物料 - + - + @@ -112,7 +114,8 @@ export default { endLocationRange: '', //终点区域 regionIndex: '', //起点区域 regionCode: '', //起点区域码 - endStationCode:'',//终点区域码 + endStationCode: '', //终点区域码 + stationCode: '', //起点站点码 }, rules: { boxBarcode: [{ required: true, message: '请扫描箱条码', trigger: 'blur' }], @@ -140,7 +143,7 @@ export default { }, regionDataStartChange(val) { const selected = this.regionDataStart.find( - item => item.stationRegion === this.form.regionIndex + item => item.stationRegion == this.form.regionIndex ); this.regionStartCode = selected.stationCodeList; // 默认选择第一个站点码 @@ -153,12 +156,25 @@ export default { getStationRegionList() { getStationRegionList().then(res => { this.regionDataStart = res.data.data; + // 查找“蓝色周转盒放置区” + const targetRegion = this.regionDataStart.find(item => item.stationRegion == '蓝色周转盒放置区'); + + if (targetRegion) { + // 默认选中该区域 + this.form.regionIndex = targetRegion.stationRegion; + // 给区域下拉框数据赋值 + this.regionStartCode = targetRegion.stationCodeList || []; + + // 可选:默认选中第一个站点码 + if (this.regionStartCode.length > 0) { + this.form.regionCode = this.regionStartCode[0]; + } + } }); }, // 获取终点站名字 endLocationChange() { const selected = this.workCenterOptions.find(item => item.id === this.form.endLocationId); - console.log(989898989898, selected); this.regionData = selected ? selected.stationRegionList : []; this.form.endName = selected ? selected.wcName : ''; }, @@ -184,12 +200,12 @@ export default { boxBarcode: this.form.boxBarcode, //箱条码 // endWcId: this.form.endLocationId, endWcId: this.form.endLocationId, // 配送模式 - }; // 送料模式:使用 stationCode if (this.form.bindType === 'bind') { params.startStationCode = this.form.stationCode; + params.stationRegion = this.form.regionName; } // 叫料模式:使用 regionCode 和 regionIndex else if (this.form.bindType === 'unbind') { diff --git a/src/views/logisticsManagement/components/unbindDialog.vue b/src/views/logisticsManagement/components/unbindDialog.vue index 5eef840..bae3b61 100644 --- a/src/views/logisticsManagement/components/unbindDialog.vue +++ b/src/views/logisticsManagement/components/unbindDialog.vue @@ -83,7 +83,12 @@ export default { getQuantityLocation({ boxBarcode: this.form.boxBarcode }).then(res => { this.formLoading = true; this.boxBarInfo = res.data.data; - this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo); + if (this.boxBarInfo.yieldOrderList !== null) { + this.orderIdList = res.data.data.yieldOrderList.map(item => item.cardNo); + } else { + this.orderIdList = []; + } + setTimeout(() => { this.$message.success('箱条码获取数据成功!'); this.formLoading = false; @@ -112,7 +117,7 @@ export default { .then(res => { this.form.orderNo = ''; this.$message.success('解绑成功'); - this.changeCode() + this.changeCode(); }) .catach(err => { this.orderIdList.pop(orderNo); diff --git a/src/views/wel/components/quickAccess.vue b/src/views/wel/components/quickAccess.vue index c824e16..32e3cb7 100644 --- a/src/views/wel/components/quickAccess.vue +++ b/src/views/wel/components/quickAccess.vue @@ -5,38 +5,86 @@ 管理
-
+
+ + 工序接收 +
+
+ + 工序报工 +
+
+ + 工序检验 +
+
+ + 生产追溯维护 +
+
+ + 电子档案维护 +
+
- +
+ \ No newline at end of file