From 8aacd6be95572afc7314ef1055d981727e230a5e Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 14 May 2026 20:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionManagement/workshopRework.js | 14 ++++++
src/api/storeManagement/otherIssuing.js | 9 ++++
.../otherIssuing/otherIssuingDailog.vue | 49 ++++++++++---------
src/views/workRate/index.vue | 10 ++--
4 files changed, 53 insertions(+), 29 deletions(-)
create mode 100644 src/api/productionManagement/workshopRework.js
diff --git a/src/api/productionManagement/workshopRework.js b/src/api/productionManagement/workshopRework.js
new file mode 100644
index 00000000..1394185e
--- /dev/null
+++ b/src/api/productionManagement/workshopRework.js
@@ -0,0 +1,14 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+ return request({
+ url: '/blade-desk/workOrder/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ },
+ });
+};
+
diff --git a/src/api/storeManagement/otherIssuing.js b/src/api/storeManagement/otherIssuing.js
index e66933c7..19e85f2d 100644
--- a/src/api/storeManagement/otherIssuing.js
+++ b/src/api/storeManagement/otherIssuing.js
@@ -116,3 +116,12 @@ export const approve = params =>
params
});
+
+
+// 根据仓库获取物料列表
+export const getGoodsListByShId = params =>
+ request({
+ url: '/api/blade-wms/combox/config/queryByShId',
+ method: 'get',
+ params
+ })
\ No newline at end of file
diff --git a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
index 72b14d5a..72dcb1bb 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
@@ -103,16 +103,16 @@
*仓库物料
-
+
-
+ /> -->
@@ -254,12 +254,12 @@ import {
getOtherOutNo,
getWarehouseList,
getKeeperList,
- getGoodsOutList,
getLocationList,
completeIssue,
getLocationData,
addIssue,
getShList,
+ getGoodsListByShId
} from '@/api/storeManagement/otherIssuing';
export default {
props: {
@@ -379,7 +379,7 @@ export default {
if (this.checkCode == '') {
this.getWare();
this.getKeeper();
- this.getGoods();
+ // this.getGoods();
} else {
this.getKeeper();
this.getShData();
@@ -418,23 +418,23 @@ export default {
}
return Array.from(seen.values());
},
- changeCode(val, item, index) {
- // let tmp = this.goodsList.find(item => item.goodsCode == val);
- // console.log('tmp------------', tmp);
+ changeCode(val, index) {
+ let tmp = this.goodsList.find(item => item.goodsCode == val);
+ console.log('tmp------------', tmp);
- if (item != undefined) {
- this.outbankList[index].goodsName = item.goodsName;
- this.outbankList[index].materialModel = item.materialModel;
- this.outbankList[index].unitName = item.unitName;
- this.outbankList[index].goodsId = item.id;
+ // if (item != undefined) {
+ this.outbankList[index].goodsName = tmp.goodsName;
+ this.outbankList[index].materialModel = tmp.materialModel;
+ this.outbankList[index].unitName = tmp.unitName;
+ this.outbankList[index].goodsId = tmp.id;
this.outbankList[index].slId = '';
this.outbankList[index].piNo = '';
this.outbankList[index].quantity = '';
- }
+ // }
getLocationData({
shId: this.stOtherOutRecord.shId,
- goodsId: item.id,
+ goodsId: tmp.id,
}).then(res => {
console.log('res--------', res);
let data = this.uniqueById(res.data.data.records);
@@ -462,7 +462,7 @@ export default {
}
},
getGoods() {
- getGoodsOutList().then(res => {
+ getGoodsListByShId().then(res => {
this.goodsList = res.data.data.records;
});
},
@@ -650,16 +650,17 @@ export default {
} else {
this.isShowInput = false;
}
- if (this.outbankList.length == 1) {
- this.outbankList[0].slId = '';
- this.outbankList[0].piNo = '';
- this.outbankList[0].quantity = '';
- getGoodsOutList({
+ if (this.outbankList.length >= 0) {
+ // this.outbankList[0].slId = '';
+ // this.outbankList[0].piNo = '';
+ // this.outbankList[0].quantity = '';
+ getGoodsListByShId({
shId: val,
}).then(res => {
this.goodsList = res.data.data.records;
- if (this.outbankList[0].goodsCode != '') {
- let tmp = this.goodsList.find(item => item.goodsCode == this.outbankList[0].goodsCode);
+ if (this.checkCode != '') {
+ let tmp = this.goodsList.find(item => item.goodsCode == this.checkCode);
+
this.outbankList[0].goodsId = tmp.id;
if (tmp) {
getLocationData({
diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue
index 1a9318f8..379ae5fb 100644
--- a/src/views/workRate/index.vue
+++ b/src/views/workRate/index.vue
@@ -145,7 +145,7 @@
实际开始：
- {{ item.factStartTime || '-' }}
+ {{ item.factStartTime || '-' }}
@@ -177,7 +177,7 @@
selectedItemInfo.factStartTime
}}
{{
- selectedItemInfo.planEndTime
+ selectedItemInfo.factEndTime
}}
{{
processDetails.testQty
@@ -579,7 +579,7 @@ export default {
return 'color: rgb(251, 170, 8)';
}
};
-
+ consolog.log(9999999,this.detailsForm)
return [
{ label: '车间订单号', value: this.detailsForm.woCode || '' },
{ label: '流程卡号', value: this.detailsForm.cardNo || '' },
@@ -590,7 +590,7 @@ export default {
clickHandler: () => this.openDocLink(this.detailsForm.dsPart),
},
{ label: '批次号', value: this.detailsForm.batchNo || '' },
- { label: '订单数量', value: this.detailsForm.poQty || '' },
+ { label: '订单数量', value: this.detailsForm.ypQty || '' },
{ label: '状态', value: this.detailsForm.curStatus || '' },
{
label: '优先级',
@@ -599,7 +599,7 @@ export default {
},
{
label: '调度员',
- value: this.detailsForm.dispatcher === null ? '' : this.detailsForm.userName,
+ value: this.detailsForm.dispatcher === null ? '' : this.detailsForm.dispatcher,
},
{ label: '订单下达', value: this.detailsForm.sendDownTime || '' },
{ label: '生产数量', value: this.detailsForm.makeQty || '' },