diff --git a/api/request2.js b/api/request2.js
index 45b1d8b6..366316b1 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -2296,13 +2296,82 @@ export function getProductionReturnRequestDetail(id) {
}
/**
- * 生产退料申请 提交
- * @param {*} params
+ * 生产退料申请 处理
+ * @param {*} id
+ *
*/
-export function productionReturnRequestSubmit(params) {
+export function productionReturnRequestHandle(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/submit",
+ url: baseApi + "/wms/productionreturn-request-main/handle?id=" + id,
method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 生产退料申请 提交审批
+ * @param {*} id
+ *
+ */
+export function productionReturnRequestSubmitApprove(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-request-main/submit?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 生产退料申请 审批通过
+ * @param {*} id
+ *
+ */
+
+export function productionReturnRequestSubmitApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-request-main/agree?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 生产退料申请 审批驳回
+ * @param {*} id
+ *
+ */
+export function productionReturnRequestSubmitApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-request-main/refused?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 生产退料申请 关闭
+ * @param {*} id
+ *
+ */
+export function productionReturnRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-request-main/close?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+
+
+/**
+ * 生产退料申请 创建
+ * @param {*} params
+ */
+
+export function productionReturnRequestCreate(params) {
+ return request({
+ url: baseApi + "/wms/productionreturn-request-main/create",
+ method: "post",
data: params,
});
}
diff --git a/pages.json b/pages.json
index b86ffb87..9b3d427a 100644
--- a/pages.json
+++ b/pages.json
@@ -529,7 +529,34 @@
{
"path": "pages/productionReturn/request/returnToStoreRequest",
"style": {
- "navigationBarTitleText": "生产退料合格申请",
+ "navigationBarTitleText": "生产合格退料申请",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/productionReturn/request/returnToStoreRequestSubmit",
+ "style": {
+ "navigationBarTitleText": "生产合格退料申请",
"enablePullDownRefresh": true,
"titleNView": {
// "autoBackButton": "true",
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 98cd0d1f..3f4bae60 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -440,7 +440,7 @@
detail.sampleQty = detail.qty;
detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty;
- detail.notPassedQty = detail.notPassedQty;
+ detail.notPassedQty = Number(detail.receiveQty)-Number(detail.crackQty);
// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id
@@ -456,18 +456,12 @@
detail.toInventoryStatus = "NOK"
}
}
- // detail.singlePrice = detail.balance.singlePrice;
- // detail.amount = detail.balance.singlePrice * detail.handleQty;
-
- // detail.arriveDate = detail.balance.arriveDate;
- // detail.produceDate = detail.balance.produceDate;
- // detail.expireDate = detail.balance.expireDate;
} else {
detail.sampleQty = detail.qty;
detail.failedQty = 0;
detail.crackQty = 0;
- detail.notPassedQty = 0;
+ detail.notPassedQty = Number(detail.receiveQty)-Number(detail.crackQty);;
detail.goodQty = detail.qty;
detail.inspectUser = this.$store.state.user.id
detail.toInventoryStatus = "OK"
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 3946deaa..7cb69a90 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -366,7 +366,7 @@
this.jobContent.subList.forEach(res => {
res.handleQty = res.qty
res.failedQty = 0;
- res.notPassedQty = 0;
+ res.notPassedQty = res.failedQty;
res.crackQty = 0;
res.goodQty = res.qty;
res.failedReason = "";
@@ -405,7 +405,7 @@
this.jobContent.subList.forEach(res => {
res.handleQty = res.qty
res.failedQty = res.qty;
- res.notPassedQty = res.qty;
+ res.notPassedQty = res.failedQty;
res.crackQty = 0;
res.goodQty = 0;
res.failedReason = "";
@@ -432,7 +432,7 @@
this.jobContent.subList.forEach(res => {
res.handleQty = res.qty
res.failedQty = 0;
- res.notPassedQty = 0;
+ res.notPassedQty = res.failedQty;
res.crackQty = 0;
res.goodQty = res.qty;
res.failedReason = "";
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 0e62f073..e60ac841 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -1,9 +1,13 @@
-
+
+
+
+ 申请单号 : {{jobContent.requestNumber}}
+
+
+
@@ -62,6 +66,7 @@
import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+ import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'issueDetail',
@@ -71,7 +76,8 @@
comIssueDetailCard,
comIssueRequestInfo,
comScanIssuePack,
- comMessage
+ comMessage,
+ jobTop
},
data() {
return {
diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue
new file mode 100644
index 00000000..d083a7ff
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestCreator.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+ 车间 : {{dataContent.workShopName}} ({{dataContent.workshopCode}})
+
+
+
+ 总数量 : {{dataContent.totalQty}}
+
+
+
+
+
+
+
+
+
+
+ 生产线 : {{item.productionLineName}}({{item.productionLineCode}})
+
+
+ 工位 : {{item.workStationName}} ({{item.workStationCode}})
+
+
+ 物品代码 : {{item.itemCode}}
+
+
+ 物品名称 : {{item.itemName}}
+
+
+
+
+ 数量 : {{item.qty}} 单位 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
new file mode 100644
index 00000000..1cb8c11f
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -0,0 +1,372 @@
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+ 位置 :
+
+
+ {{positionInfo}}
+
+
+
+
+
+
+
+
+
+ 物料：
+
+ {{itemCode}}
+
+
+
+
+
+
+
+
+
+
+
+ 数量 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/productionReturn/coms/comScanReturnPack.vue b/pages/productionReturn/coms/comScanReturnPack.vue
new file mode 100644
index 00000000..1b2bc367
--- /dev/null
+++ b/pages/productionReturn/coms/comScanReturnPack.vue
@@ -0,0 +1,508 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/productionReturn/request/returnToHoldRequest.vue b/pages/productionReturn/request/returnToHoldRequest.vue
index b763866e..f46e1b77 100644
--- a/pages/productionReturn/request/returnToHoldRequest.vue
+++ b/pages/productionReturn/request/returnToHoldRequest.vue
@@ -35,6 +35,11 @@
} from '@/common/record.js';
import {
getProductionReturnRequestList,
+ productionReturnRequestHandle,
+ productionReturnRequestSubmitApprove,
+ productionReturnRequestSubmitApproveAgree,
+ productionReturnRequestSubmitApproveRefused,
+ productionReturnRequestClose
} from '@/api/request2.js';
import {
goHome,
@@ -73,7 +78,7 @@
detailAndHandleOption: [],
detailAndCloseOption: [],
showOptions: [],
- fromType: "requestType",
+ fromType: "ReturnToHold",
loadingType: "nomore",
businessCode: "ReturnToHold"
@@ -115,7 +120,6 @@
},
methods: {
- requestConfirm(action, item) {},
openRequestInfoPopup(item) {
this.$refs.requestInfoPopup.openPopup(item)
@@ -149,6 +153,7 @@
action: "==",
value: this.businessCode
})
+
var params = {
filters: filters,
pageNo: this.pageNo,
@@ -174,13 +179,13 @@
this.requestList = type === "refresh" ? list : this.requestList.concat(list);
this.pageNo++;
- updateTitle("生产隔离退料申请(" + this.totalCount + ")");
+ updateTitle("生产合格退料申请(" + this.totalCount + ")");
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("生产隔离退料申请");
+ updateTitle("生产合格退料申请");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -205,27 +210,47 @@
openScanDetailPopup() {
uni.navigateTo({
- url: "../record/returnToHold?fromType=" + this.fromType
+ url: "./returnToStoreRequestSubmit?fromType=" + this.fromType
})
},
-
swipeClick(e, dataContent) {
+ var text = clearTirmAndWrap(e.content.text)
if (e.content.text == "详情") {
- console.log("详情", dataContent.id)
this.openRequestInfoPopup(dataContent);
} else if (e.content.text == "处理") {
- console.log("处理")
+ this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+ this.productionReturnRequestHandle(dataContent.id)
+ })
} else if (e.content.text == "审批") {
- console.log("审批")
+ this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApprove(dataContent.id)
+ })
} else if (e.content.text == "审批通过") {
- console.log("审批通过")
+ this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApproveAgree(dataContent.id)
+ })
} else if (e.content.text == "审批驳回") {
- console.log("审批驳回")
+ this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApproveRefused(dataContent.id)
+ })
} else if (e.content.text == "关闭") {
- console.log("关闭")
+ this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+ this.productionReturnRequestClose(dataContent.id)
+ })
}
},
+
+ showQuestionMessage(hint,callBack){
+ this.$refs.comMessage.showQuestionMessage(hint,
+ res => {
+ if (res) {
+ callBack()
+ }
+ });
+ },
+
+
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@@ -274,6 +299,82 @@
}
});
},
+ productionReturnRequestSubmitApprove(id) {
+ productionReturnRequestSubmitApprove(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请提交审批成功"
+ })
+ } else {
+ this.showMessage("申请提交审批失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+
+ },
+ productionReturnRequestClose(id) {
+ productionReturnRequestClose(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请关闭成功"
+ })
+ } else {
+ this.showMessage("申请关闭失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestSubmitApproveAgree(id) {
+ productionReturnRequestSubmitApproveAgree(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批通过成功"
+ })
+ } else {
+ this.showMessage("申请审批通过失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestSubmitApproveRefused(id) {
+ productionReturnRequestSubmitApproveRefused(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批驳回成功"
+ })
+ } else {
+ this.showMessage("申请审批驳回失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestHandle(id) {
+ productionReturnRequestHandle(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请处理成功"
+ })
+ } else {
+ this.showMessage("申请处理失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
}
}
diff --git a/pages/productionReturn/request/returnToStoreRequest.vue b/pages/productionReturn/request/returnToStoreRequest.vue
index cfd869bf..9c7ebbfe 100644
--- a/pages/productionReturn/request/returnToStoreRequest.vue
+++ b/pages/productionReturn/request/returnToStoreRequest.vue
@@ -35,6 +35,11 @@
} from '@/common/record.js';
import {
getProductionReturnRequestList,
+ productionReturnRequestHandle,
+ productionReturnRequestSubmitApprove,
+ productionReturnRequestSubmitApproveAgree,
+ productionReturnRequestSubmitApproveRefused,
+ productionReturnRequestClose
} from '@/api/request2.js';
import {
goHome,
@@ -73,7 +78,7 @@
detailAndHandleOption: [],
detailAndCloseOption: [],
showOptions: [],
- fromType: "requestType",
+ fromType: "ReturnToStore",
loadingType: "nomore",
businessCode: "ReturnToStore"
@@ -205,27 +210,47 @@
openScanDetailPopup() {
uni.navigateTo({
- url: "../record/returnToStore?fromType=" + this.fromType
+ url: "./returnToStoreRequestSubmit?fromType=" + this.fromType
})
},
-
swipeClick(e, dataContent) {
+ var text = clearTirmAndWrap(e.content.text)
if (e.content.text == "详情") {
- console.log("详情", dataContent.id)
this.openRequestInfoPopup(dataContent);
} else if (e.content.text == "处理") {
- console.log("处理")
+ this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+ this.productionReturnRequestHandle(dataContent.id)
+ })
} else if (e.content.text == "审批") {
- console.log("审批")
+ this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApprove(dataContent.id)
+ })
} else if (e.content.text == "审批通过") {
- console.log("审批通过")
+ this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApproveAgree(dataContent.id)
+ })
} else if (e.content.text == "审批驳回") {
- console.log("审批驳回")
+ this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+ this.productionReturnRequestSubmitApproveRefused(dataContent.id)
+ })
} else if (e.content.text == "关闭") {
- console.log("关闭")
+ this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+ this.productionReturnRequestClose(dataContent.id)
+ })
}
},
+
+ showQuestionMessage(hint,callBack){
+ this.$refs.comMessage.showQuestionMessage(hint,
+ res => {
+ if (res) {
+ callBack()
+ }
+ });
+ },
+
+
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@@ -274,6 +299,82 @@
}
});
},
+ productionReturnRequestSubmitApprove(id) {
+ productionReturnRequestSubmitApprove(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请提交审批成功"
+ })
+ } else {
+ this.showMessage("申请提交审批失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+
+ },
+ productionReturnRequestClose(id) {
+ productionReturnRequestClose(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请关闭成功"
+ })
+ } else {
+ this.showMessage("申请关闭失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestSubmitApproveAgree(id) {
+ productionReturnRequestSubmitApproveAgree(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批通过成功"
+ })
+ } else {
+ this.showMessage("申请审批通过失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestSubmitApproveRefused(id) {
+ productionReturnRequestSubmitApproveRefused(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批驳回成功"
+ })
+ } else {
+ this.showMessage("申请审批驳回失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ productionReturnRequestHandle(id) {
+ productionReturnRequestHandle(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请处理成功"
+ })
+ } else {
+ this.showMessage("申请处理失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
}
}
diff --git a/pages/productionReturn/request/returnToStoreRequestSubmit.vue b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
new file mode 100644
index 00000000..28d6b4c6
--- /dev/null
+++ b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/putaway/coms/comPutawayJobCard.vue b/pages/putaway/coms/comPutawayJobCard.vue
index 6da43026..4f19c5d3 100644
--- a/pages/putaway/coms/comPutawayJobCard.vue
+++ b/pages/putaway/coms/comPutawayJobCard.vue
@@ -12,19 +12,10 @@
- 客户名称 : {{dataContent.customerName}}
+ 客户代码 : {{dataContent.supplierCode}}
-
-
-
-
- 物品代码 : {{dataContent.itemCode}}
-
-
-
-
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 83281c14..225a0933 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -1,5 +1,12 @@
+
+
+
+ 申请单号 : {{jobContent.requestNumber}}
+
+
+
@@ -15,7 +22,6 @@
-