diff --git a/api/request2.js b/api/request2.js
index d5348b3d..04a61954 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1095,26 +1095,26 @@ export function getInventoryMoveJobDetail(id) {
}
/**
- * 生产收料 任务承接
+ * 库存转移任务 任务承接
* @param {*} id
*
*/
export function takeInventoryMoveJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+ url: baseApi + "/wms/inventorymove-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
- * 生产收料 放弃承接
+ * 库存转移任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeInventoryMoveJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/inventorymove-job-main/abandon?id=" + id,
method: "put",
data: {},
});
@@ -1128,7 +1128,7 @@ export function cancleTakeInventoryMoveJob(id) {
*/
export function inventoryMoveSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/wms/inventorymove-job-main/execute",
method: "put",
data: params,
});
@@ -1619,40 +1619,40 @@ export function getProductPutawayJobDetail(id) {
}
/**
- * 制品上架 承接
+ * 制品上架任务 承接
* @param {*} id
*
*/
export function takeProductPutawayJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/productputaway-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
- * 制品上架 放弃承接
+ * 制品上架任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeProductPutawayJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
- method: "get",
+ url: baseApi + "/wms/productputaway-job-main/abandon?id=" + id,
+ method: "put",
data: {},
});
}
/**
- * 制品上架 任务提交
+ * 制品上架任务 提交
* @param {*} 任务id
*
*/
export function productPutawayJobSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
+ url: baseApi + "/wms/productputaway-job-main/execute",
method: "put",
data: params,
});
@@ -2209,6 +2209,65 @@ export function productPutawayRequestSubmit(params) {
data: params,
});
}
+/**
+ * 制品上架申请 处理
+ * @param {*} params
+ */
+export function productPutawayRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/productputaway-request-main/handle?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 制品上架申请 提交审批
+ * @param {*} params
+ */
+export function productPutawayRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/productputaway-request-main/submit?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 制品上架申请 提交审批通过
+ * @param {*} params
+ */
+export function productPutawayRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/productputaway-request-main/agree?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 制品上架申请 审批驳回
+ * @param {*} params
+ */
+export function productPutawayRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/productputaway-request-main/refused?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 制品上架申请 关闭任务
+ * @param {*} params
+ */
+export function productPutawayRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/productputaway-request-main/close?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
/**
* 发料申请列表
diff --git a/main.js b/main.js
index 19300141..ffbacd21 100644
--- a/main.js
+++ b/main.js
@@ -72,6 +72,7 @@ export function startApp(app) {
app.config.globalProperties.$recepit_configList = res.data.recepit_configList;
getApp().globalData.recepit_configList = res.data.recepit_configList;
getApp().globalData.feed_configList = res.data.feed_configList;
+ getApp().globalData.isDevelopment = res.data.baseInfo.isDevelopment.value
}
},
fail: (error) => {
diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue
index 5c1c33cb..4d48354c 100644
--- a/mycomponents/balance/balance.vue
+++ b/mycomponents/balance/balance.vue
@@ -14,12 +14,16 @@
-
- 复制箱码
-
-
- 复制制品
+
+
+ 复制箱码
+
+
+ 复制制品
+
+
+
@@ -102,6 +106,9 @@
})
}
)
+ },
+ isDevlement(){
+ return getApp().globalData.isDevelopment;
}
}
}
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 1b2e2431..dc7295b7 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -17,7 +17,7 @@
-
+
复制采购
|制品
@@ -105,6 +105,9 @@
})
}
)
+ },
+ isDevlement(){
+ return getApp().globalData.isDevelopment;
}
}
}
diff --git a/mycomponents/recommend/recommendCount.vue b/mycomponents/recommend/recommendCount.vue
index 14a1559d..a3c2b519 100644
--- a/mycomponents/recommend/recommendCount.vue
+++ b/mycomponents/recommend/recommendCount.vue
@@ -16,7 +16,7 @@
-
+
复制采购
|制品
@@ -108,6 +108,9 @@
})
}
)
+ },
+ isDevlement(){
+ return getApp().globalData.isDevelopment;
}
}
}
diff --git a/pages.json b/pages.json
index bb90ef27..f0985149 100644
--- a/pages.json
+++ b/pages.json
@@ -35,16 +35,16 @@
"navigationBarTitleText": "登录",
"titleNView": {
// "autoBackButton": "true",
- "buttons": [
- // 右边按钮
- {
- "float": "right",
- "fontSize": "52rpx", //按钮上文字的大小
- "text": "\ue706",
- "fontSrc": "/static/ali_icon/iconfont.ttf"
- }
-
- ]
+ // "buttons": [
+ // // 右边按钮
+ // {
+ // "float": "right",
+ // "fontSize": "52rpx", //按钮上文字的大小
+ // "text": "\ue706",
+ // "fontSrc": "/static/ali_icon/iconfont.ttf"
+ // }
+
+ // ]
}
}
},
@@ -1202,6 +1202,14 @@
}
},
+ {
+ "path": "pages/productPutaway/request/putawayRequestCreate",
+ "style": {
+ "navigationBarTitleText": "制品上架申请创建",
+ "enablePullDownRefresh": false
+
+ }
+ },
{
"path": "pages/productDismantle/job/productDismantleJob",
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 9ddd64d4..a0e68845 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -270,27 +270,39 @@
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+
+
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续上架?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty)
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续上架?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty)
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty)
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty)
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty)
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 9c77da89..db6d8e6b 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -309,17 +309,25 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续检验?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty)
- itemDetail.balance = result.balance;
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续检验?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty)
+ itemDetail.balance = result.balance;
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.balance = result.balance;
@@ -441,7 +449,7 @@
detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty;
- // detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
+ detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id
//合格数==样品数,全部合格
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index 539eb678..df0be900 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -148,24 +148,24 @@
},
methods: {
- deleteFileById(id){
- deleteFileById(id).then(res=>{
-
- })
-
+ deleteFileById(id) {
+ deleteFileById(id).then(res => {
+
+ })
+
},
- getFileList(id){
+ getFileList(id) {
getFileList("jobInspectDetail", id).then(res => {
- if(res.data){
- res.data.forEach(res=>{
+ if (res.data) {
+ res.data.forEach(res => {
this.deleteFileById(res.id)
})
}
})
},
-
- clearPicList(subList){
- subList.forEach(item=>{
+
+ clearPicList(subList) {
+ subList.forEach(item => {
this.getFileList(item.id)
})
},
@@ -325,17 +325,25 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续检验?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty)
- itemDetail.balance = result.balance;
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续检验?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty)
+ itemDetail.balance = result.balance;
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.balance = result.balance;
@@ -353,23 +361,33 @@
commit() {
this.scanCount = getScanCount(this.subList);
- // if (this.scanCount == 0) {
- // this.showErrorMessage("扫描数为0,请先扫描")
- // return;
- // }
- //如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日
- if (this.jobContent.allowPartialComplete == "TRUE") {
- this.submitJob();
+
+ if (this.scanCount == 0) {
+ this.showErrorMessage("扫描数为0,请先扫描")
+ return;
} else {
- //不允许部分提交,提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
+ if (this.scanCount == this.subList.length) {
+ this.submitJob();
+ } else {
+ //如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日
+ if (this.jobContent.allowPartialComplete == "TRUE") {
+ this.submitJob();
+ } else {
+ //不允许部分提交,提示
+ this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ "]箱总共[" + this
+ .subList.length + "]箱", res => {
+ if (res) {
+ this.openScanPopup();
+ }
+ });
+ }
+ }
}
+
+
+
+
},
submitJob() {
@@ -449,7 +467,7 @@
detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty;
- // detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
+ detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id
//合格数==样品数,全部合格
diff --git a/pages/inventoryMove/coms/comInventoryJobCard.vue b/pages/inventoryMove/coms/comInventoryJobCard.vue
index 81e61e52..98946e3d 100644
--- a/pages/inventoryMove/coms/comInventoryJobCard.vue
+++ b/pages/inventoryMove/coms/comInventoryJobCard.vue
@@ -3,19 +3,7 @@
- 物品代码 : {{dataContent.itemCode}}
-
-
-
-
-
- 来源库位 : {{dataContent.fromLocationCode}}
-
-
-
-
-
- 目标库位 : {{dataContent.toLocationCode}}
+ 申请单号 : {{dataContent.requestNumber}}
diff --git a/pages/inventoryMove/coms/comMoveJob.vue b/pages/inventoryMove/coms/comMoveJob.vue
index 7e4ab8f1..17d78497 100644
--- a/pages/inventoryMove/coms/comMoveJob.vue
+++ b/pages/inventoryMove/coms/comMoveJob.vue
@@ -28,12 +28,9 @@
+
+
\ No newline at end of file
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 1425e40d..77de3139 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,7 +14,7 @@
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 0d078716..d93fbc3e 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -275,32 +275,38 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续上架?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.supplierCode = supplierCode
- itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
- .qty) ? Number(result.balance.qty) : Number(result.label.qty);
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续上架?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.supplierCode = supplierCode
+ itemDetail.handleQty = Number(result.balance.qty)
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty)
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.supplierCode = supplierCode
- itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
- .qty) ? Number(result.balance.qty) : Number(result.label.qty);
+ itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty)
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
index 01667f18..2cf2958f 100644
--- a/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -326,10 +326,10 @@
productionReturnRequestSubmitApprove(id) {
productionReturnRequestSubmitApprove(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
@@ -342,10 +342,10 @@
productionReturnRequestClose(id) {
productionReturnRequestClose(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
@@ -357,10 +357,10 @@
productionReturnRequestSubmitApproveAgree(id) {
productionReturnRequestSubmitApproveAgree(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
@@ -372,10 +372,10 @@
productionReturnRequestSubmitApproveRefused(id) {
productionReturnRequestSubmitApproveRefused(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
@@ -387,10 +387,10 @@
productionReturnRequestHandle(id) {
productionReturnRequestHandle(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 82710c38..beb7f379 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -247,29 +247,37 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续退货?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty) ;
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty =result.package.stdPackQty
- itemDetail.balance.stdPackUnit =result.package.stdPackUnit
-
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续退货?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = result.balance.qty;
+ itemDetail.balance.stdPackQty =result.package.stdPackQty
+ itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty =result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty =Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit =result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
index 6633e215..a751475e 100644
--- a/pages/purchaseReturn/request/returnRequest.vue
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -293,10 +293,10 @@
purchaseReturnRequestApprove(id) {
purchaseReturnRequestApprove(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
@@ -310,10 +310,10 @@
purchaseReturnRequestClose(id) {
purchaseReturnRequestClose(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
@@ -325,10 +325,10 @@
purchaseReturnRequestApproveAgree(id) {
purchaseReturnRequestApproveAgree(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
@@ -340,10 +340,10 @@
purchaseReturnRequestApproveRefused(id) {
purchaseReturnRequestApproveRefused(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
@@ -355,10 +355,10 @@
purchaseReturnRequestHandle(id) {
purchaseReturnRequestHandle(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index ffb98f35..d21fd2bc 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -295,28 +295,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续上架?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty) ;
- itemDetail.toInventoryStatus =result.balance.inventoryStatus
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续上架?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus =result.balance.inventoryStatus
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
- itemDetail.toInventoryStatus =itemDetail.inventoryStatus
+ itemDetail.toInventoryStatus = itemDetail.inventoryStatus
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index c8f504fe..f62413b3 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -211,27 +211,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续出库?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.label.qty);
- itemDetail.inventoryStatus = result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续出库?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty);
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty);
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.label.qty);
+ itemDetail.handleQty = Number(result.balance.qty);
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty);
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/scrap/request/scrapRrequest.vue b/pages/scrap/request/scrapRrequest.vue
index 74b31979..7af80876 100644
--- a/pages/scrap/request/scrapRrequest.vue
+++ b/pages/scrap/request/scrapRrequest.vue
@@ -287,10 +287,10 @@
scrapRequestApprove(id) {
scrapRequestApprove(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
@@ -304,10 +304,10 @@
scrapRequestClose(id) {
scrapRequestClose(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
@@ -319,10 +319,10 @@
scrapRequestApproveAgree(id) {
scrapRequestApproveAgree(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
@@ -334,10 +334,10 @@
scrapRequestApproveRefused(id) {
scrapRequestApproveRefused(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
@@ -349,10 +349,10 @@
scrapRequestHandle(id) {
scrapRequestHandle(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index da4d7c5b..9367f3de 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -269,28 +269,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续出库?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty;
- itemDetail.toInventoryStatus = result.balance.inventoryStatus
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续出库?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty =Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty;
+ itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 7288144a..7d0c67f7 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -272,28 +272,37 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续入库?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty;
- itemDetail.toInventoryStatus = result.balance.inventoryStatus
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续入库?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
+
} else {
itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty;
+ itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
index f02ba566..4319f35a 100644
--- a/pages/transfer/job/transferDetail.vue
+++ b/pages/transfer/job/transferDetail.vue
@@ -320,16 +320,24 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续上架?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续上架?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index 7d73b674..ebcd52bb 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -229,26 +229,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续出库?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
- itemDetail.balance.stdPackUnit = result.package.stdPackUnit
- this.calcHandleQty();
- } else {
+ if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+ this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,是否继续出库?', res => {
+ if (res) {
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.balance = result.balance;
+ itemDetail.balance.balanceQty = Number(result.balance.qty);
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+ itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+ this.calcHandleQty();
+ } else {
+ this.scanPopupGetFocus();
+ }
+ });
+ }else {
+ this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ ']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
- }
- });
+ });
+ }
+
} else {
itemDetail.scaned = true;
- itemDetail.handleQty = result.label.qty
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.stdPackQty = result.package.stdPackQty
+ itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+ itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
}
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
index 7d974e7d..4895f0a1 100644
--- a/pages/unPlanned/request/issueRequest.vue
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -295,10 +295,10 @@
unPlannedIssueRequestApprove(id) {
unPlannedIssueRequestApprove(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
@@ -312,10 +312,11 @@
unPlannedIssueRequestClose(id) {
unPlannedIssueRequestClose(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
+ this.getList("refresh")
+
} else {
this.showMessage("申请关闭失败")
}
@@ -327,10 +328,11 @@
unPlannedIssueRequestApproveAgree(id) {
unPlannedIssueRequestApproveAgree(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
+ this.getList("refresh")
+
} else {
this.showMessage("申请审批通过失败")
}
@@ -342,10 +344,10 @@
unPlannedIssueRequestApproveRefused(id) {
unPlannedIssueRequestApproveRefused(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
@@ -357,10 +359,10 @@
unPlannedIssueRequestHandle(id) {
unPlannedIssueRequestHandle(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
diff --git a/pages/unPlanned/request/receiptRequest.vue b/pages/unPlanned/request/receiptRequest.vue
index 600eaddc..77dacb7a 100644
--- a/pages/unPlanned/request/receiptRequest.vue
+++ b/pages/unPlanned/request/receiptRequest.vue
@@ -293,10 +293,10 @@
unPlannedReceiptRequestApprove(id) {
unPlannedReceiptRequestApprove(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
@@ -310,10 +310,10 @@
unPlannedReceiptRequestClose(id) {
unPlannedReceiptRequestClose(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
@@ -325,10 +325,11 @@
unPlannedReceiptRequestApproveAgree(id) {
unPlannedReceiptRequestApproveAgree(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
+ this.getList("refresh")
+
} else {
this.showMessage("申请审批通过失败")
}
@@ -340,10 +341,10 @@
unPlannedReceiptRequestApproveRefused(id) {
unPlannedReceiptRequestApproveRefused(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
@@ -355,10 +356,10 @@
unPlannedReceiptRequestHandle(id) {
unPlannedReceiptRequestHandle(id).then(res => {
if (res.data) {
- this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
+ this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
diff --git a/static/config.json b/static/config.json
index 66093d32..67781eb9 100644
--- a/static/config.json
+++ b/static/config.json
@@ -20,7 +20,7 @@
"name": "request_url",
"value": "http://192.168.0.230:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api",
- "chenfang": "http://192.168.0.178:12080/admin-api",
+ "chefang": "http://192.168.0.180:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api",
"liuchen": "http://192.168.0.159:12080/admin-api",
"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
@@ -32,7 +32,13 @@
"name": "tenantId",
"value": "1",
"desc": "租户id"
+ },
+ "isDevelopment": {
+ "name": "isDevelopment",
+ "value": true,
+ "desc": "是否是开发模式,true是开发模式,false不是开发模式"
}
+
},
"recepit_configList": [