From e4e77e15d2db849cf236a77bebc0f2c29871d156 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 1 Dec 2023 14:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mycomponents/detail/comRequestDetailCard.vue | 54 ++++++++++---------
mycomponents/qty/balanceQty.vue | 2 +-
pages/issue/coms/comIssueRequestCard.vue | 3 --
pages/issue/coms/comIssueRequestInfo.vue | 57 ++++++++++++++++++++
pages/issue/coms/comScanIssuePack.vue | 10 ++--
pages/issue/job/issueDetail.vue | 26 ++-------
pages/issue/request/issueRequestDetail.vue | 49 +++++++----------
static/config.json | 2 +-
8 files changed, 115 insertions(+), 88 deletions(-)
create mode 100644 pages/issue/coms/comIssueRequestInfo.vue
diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 8cb916fa..2e1dc2c3 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -1,28 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -32,6 +23,10 @@
import recommend from '@/mycomponents/recommend/recommend.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
+ import itemQty from '@/mycomponents/item/itemQty.vue'
+ import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+ import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+
import {
getDetailOption,
getDetailEditRemoveOption,
@@ -45,6 +40,9 @@
recommend,
balanceQtyEdit,
comMessage,
+ itemQty,
+ comIssueRequestInfo,
+ requestDetailInfoPopup
},
props: {
dataContent: {
@@ -69,7 +67,9 @@
},
},
watch: {
-
+ dataContent(newVal) {
+ this.requestItem = newVal.subList[0];
+ },
},
data() {
@@ -81,6 +81,7 @@
}
},
+ requestItem: {},
detailOptions: [],
scanOptions: []
}
@@ -116,9 +117,10 @@
},
detail(item) {
- this.$emit('openDetail', item);
- // this.showItem = item;
- // this.$refs.jobDetailPopup.openPopup(item)
+ this.$refs.jobDetailPopup.openPopup(item)
+ // this.$emit('openDetail', item);
+ // // this.showItem = item;
+ // // this.$refs.jobDetailPopup.openPopup(item)
},
remove(item) {
this.$refs.message.showQuestionMessage("确定移除扫描信息?",
diff --git a/mycomponents/qty/balanceQty.vue b/mycomponents/qty/balanceQty.vue
index d1358a3d..fa5ee3c5 100644
--- a/mycomponents/qty/balanceQty.vue
+++ b/mycomponents/qty/balanceQty.vue
@@ -6,7 +6,7 @@
{{Number(dataContent.qty)}}
-
+
diff --git a/pages/issue/coms/comIssueRequestCard.vue b/pages/issue/coms/comIssueRequestCard.vue
index 8f7f4b5a..023acba5 100644
--- a/pages/issue/coms/comIssueRequestCard.vue
+++ b/pages/issue/coms/comIssueRequestCard.vue
@@ -1,9 +1,6 @@
-
- 部门 : {{dataContent.departmentCode}}
-
车间代码 : {{dataContent.WorkshopCode}}
diff --git a/pages/issue/coms/comIssueRequestInfo.vue b/pages/issue/coms/comIssueRequestInfo.vue
new file mode 100644
index 00000000..fbb64a31
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestInfo.vue
@@ -0,0 +1,57 @@
+
+
+
+
+ 车间
+ {{workShopCode}}
+
+
+ 生产线
+ {{dataContent.productionLineCode}}
+
+
+ 工位
+ {{ dataContent.workStationCode }}
+
+
+ 原材料库
+ {{ dataContent.toLocationCode}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 77b289cc..2564ad7e 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -7,7 +7,7 @@
扫描箱码
关闭
-
{{positionInfo}}
-
+
-
-
+ -->
+
-
-
-
- 车间
- {{jobContent.workShopCode}}
-
-
- 生产线
- {{toLocation.productionLineCode}}
-
-
- 工位
- {{ toLocation.workStationCode }}
-
-
- 原材料库
- {{ toLocation.toLocationCode}}
-
-
-
-
+
@@ -80,13 +60,15 @@
import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
-
+ import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+
export default {
name: 'issueDetail',
components: {
jobDetailPopup,
winScanButton,
comIssueDetailCard,
+ comIssueRequestInfo,
comScanIssuePack,
comMessage
},
diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue
index dce7a970..eaf62e57 100644
--- a/pages/issue/request/issueRequestDetail.vue
+++ b/pages/issue/request/issueRequestDetail.vue
@@ -1,19 +1,15 @@
-
-
+
-
-
+
+
-
-
@@ -34,13 +30,12 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
- import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
- import comMessage from '@/mycomponents/common/comMessage.vue'
+ import comMessage from '@/mycomponents/common/comMessage.vue'
+
export default {
components: {
comRequestDetailCard,
- requestDetailInfoPopup,
comMessage,
},
data() {
@@ -48,7 +43,6 @@
id: '',
requestContent: {}, //任务内容
subList: [], //接口返回的任务
- detailSource: [], //绑定在页面上的数据源
};
},
onLoad(option) {
@@ -83,36 +77,31 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
- if (res.data.subList.length > 0) {
- that.requestContent = res.data;
- that.subList = res.data.subList;
- that.subList.forEach(res=>{
- res.fromLocationCode = res.toLocationCode
- })
- that.detailSource = getDataSource(that.subList);
- updateTitle(this.requestContent.number);
- } else {
- that.showMessage('列表数据为0');
- }
+ if (res.data.subList.length > 0) {
+ that.requestContent = res.data;
+ that.requestContent.subList=res.data.subList;
+ that.subList = res.data.subList;
+ // that.subList.forEach(res => {
+ // res.fromLocationCode = res.toLocationCode
+ // })
+ // that.detailSource = getDataSource(that.subList);
+ updateTitle(this.requestContent.number);
+ } else {
+ that.showMessage('列表数据为0');
+ }
}
}).catch(error => {
uni.hideLoading()
this.showMessage(error)
})
},
-
+
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
- if (res) {
- }
+ if (res) {}
});
},
- openDetail(item) {
- this.$refs.jobDetailPopup.openPopup(item)
- },
-
-
}
}
diff --git a/static/config.json b/static/config.json
index d6de88d6..0e975816 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",
"dev":"http://dev.ccwin-in.com:25100/api/admin-api",
"local":"http://localhost:12080",