diff --git a/api/request2.js b/api/request2.js
index dfbf8ad3..ca0798db 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -634,7 +634,7 @@ export function purchaseReturnRequestClose(id) {
* 采购退货申请 提交审批
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApprove(id) {
+export function purchaseReturnRequestApprove(id) {
return request({
url: baseApi + "/wms/purchasereturn-request-main/submit?id="+id,
method: "put",
@@ -646,7 +646,7 @@ export function purchaseReturnRequestSubmitApprove(id) {
* 采购退货申请 提交审批通过
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApproveAgree(id) {
+export function purchaseReturnRequestApproveAgree(id) {
return request({
url: baseApi + "/wms/purchasereturn-request-main/agree?id="+id,
method: "put",
@@ -658,7 +658,7 @@ export function purchaseReturnRequestSubmitApproveAgree(id) {
* 采购退货申请 审批驳回
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApproveRefused(id) {
+export function purchaseReturnRequestApproveRefused(id) {
return request({
url: baseApi + "/wms/purchasereturn-request-main/refused?id="+id,
method: "put",
@@ -1270,17 +1270,78 @@ export function unPlannedReceiptJobSubmit(params) {
}
/**
- * 计划外入库申请 提交
+ * 计划外入库申请 创建
* @param {*} params
*/
-export function unPlannedReceiptRequestbSubmit(params) {
+export function unPlannedReceiptRequestCreate(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit",
- method: "put",
+ url: baseApi + "/wms/unplannedreceipt-request-main/create",
+ method: "post",
data: params,
});
}
+/**
+ * 计划外入库申请 提交审批
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/submit?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 关闭
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/close?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 审批通过
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/agree?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 审批驳回
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/refused?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 处理
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/handle?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+
/**
* 计划外入库记录 提交
* @param {*} params
@@ -1365,7 +1426,7 @@ export function unPlannedIssueJobSubmit(params) {
* 计划外出库申请 提交
* @param {*} params
*/
-export function unPlannedIssueRequestSubmit(params) {
+export function unPlannedIssueRequestCreate(params) {
return request({
url: baseApi + "/wms/unplannedissue-request-main/create",
method: "post",
@@ -1373,6 +1434,67 @@ export function unPlannedIssueRequestSubmit(params) {
});
}
+/**
+ * 计划外出库申请 提交审批
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/submit?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 关闭
+ * @param {*} params
+ */
+export function unPlannedIssueRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/close?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 审批通过
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/agree?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 审批驳回
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/refused?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 处理
+ * @param {*} params
+ */
+export function unPlannedIssueRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/handle?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+
/**
* 计划外出库记录 提交
* @param {*} params
@@ -2465,7 +2587,7 @@ export function unPlannedReceiptRequestSubmit(params) {
/**
- * 报废出库 任务
+ * 报废出库任务
* status 任务状态
* 开始日期
* 结束日期
@@ -2498,7 +2620,7 @@ export function getScrapJobDetail(id) {
*/
export function takeScrapJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/accept?id=" + id,
method: "put",
data: {},
});
@@ -2511,7 +2633,7 @@ export function takeScrapJob(id) {
*/
export function cancleTakeScrapJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/abandon?id=" + id,
method: "put",
data: {},
});
@@ -2524,7 +2646,7 @@ export function cancleTakeScrapJob(id) {
*/
export function scrapJobSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/execute",
method: "put",
data: params,
});
@@ -2560,17 +2682,77 @@ export function getScrapRequestDetail(id) {
}
/**
- * 报废出库申请 提交
+ * 报废出库申请 创建
* @param {*} params
*/
-export function scrapRequestSubmit(params) {
+export function scrapRequestCreate(params) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/submit",
- method: "put",
+ url: baseApi + "/wms/scrap-request-main/create",
+ method: "post",
data: params,
});
}
+/**
+ * 报废出库申请 提交审批
+ * @param {*} params
+ */
+export function scrapRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/submit?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 关闭
+ * @param {*} params
+ */
+export function scrapRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/close?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批通过
+ * @param {*} params
+ */
+export function scrapRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/agree?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params
+ */
+export function scrapRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/refused?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params
+ */
+export function scrapRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/handle?id="+id,
+ method: "put",
+ data: {},
+ });
+}
+
/**
* 报废出库记录 提交
* @param {*} params
diff --git a/common/basic.js b/common/basic.js
index b170962e..f3507b2a 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -715,6 +715,75 @@ export function getTodayDate() {
return startTime + "," + endTime;
}
+export function getCurrDateOneMonthsTimes() {
+ var end = Date.now()
+ // var end = new Date('2019/12/31 15:18').getTime()
+ var day = 31
+ var enda = new Date(end);
+ var endm = enda.getMonth() + 1;
+ var d = enda.getDate();
+ if (endm == 4 || endm == 6 || endm == 9 || endm == 11) {
+ day = 30
+ } else {
+ if (d == 31) {
+ day = 30
+ }
+ if (endm == 7 || endm == 12) {
+ day = 31
+ }
+ }
+ if (endm == 1) {
+ var endy = enda.getFullYear();
+ day = 31
+ if (d == 31) {
+ day = 28
+ }
+ if (d == 30) {
+ day = 29
+ }
+ if (d == 29) {
+ day = 30
+ }
+ if (endy % 4 == 0) {
+ day = 31
+ if (d == 31) {
+ day = 29
+ }
+ if (d == 30) {
+ day = 30
+ }
+ if (d == 29) {
+ day = 31
+ }
+ }
+ }
+ if (endm == 2) {
+ var endy = enda.getFullYear();
+ day = 28
+ if (endy % 4 == 0) {
+ day = 29
+ }
+ }
+ var start = 1000 * 60 * 60 * 24 * day
+ var interval = end + start;
+ return interval;
+}
+
+
+export function getCurrDateTimes() {
+ var time = (new Date()).getTime();
+ return time;
+}
+
+export function getBatch() {
+ var date = new Date();
+ var year = date.getFullYear(); //年
+ var month = date.getMonth() + 1; //月
+ var day = date.getDate(); //日
+ var batch =year.toString()+month.toString()+day.toString()
+ return batch;
+}
+
export function getCurrDate() {
var date = new Date();
return getDate(date);
@@ -733,11 +802,11 @@ export function getISODateTime() {
//格式化处理
export function dateFormat(time) {
var result = ""
- if(time!=null){
+ if (time != null) {
let date = new Date(time);
result = getDate(date) + " " + getTime(date);
}
-
+
return result;
}
diff --git a/common/directory.js b/common/directory.js
index 0ae9dfd8..80c38b53 100644
--- a/common/directory.js
+++ b/common/directory.js
@@ -9,6 +9,7 @@ let containerTypeList = [];
let packUnitList = [];
let requestStatusList = [];
let unplannedReceiptReasonList = [];
+let unplannedIssueReasonList = [];
let unplannedIissueReason = [];
let scrapReasonList = [];
let inspectFailedReasonList = [];
@@ -42,6 +43,7 @@ export function clearCacheData() {
packUnitList = [];
requestStatusList = [];
unplannedReceiptReasonList = [];
+ unplannedIssueReasonList=[];
unplannedIissueReason = [];
scrapReasonList = [];
inspectFailedReasonList = [];
@@ -329,7 +331,7 @@ export function getUnPlannedReceiptReasonList(value) {
}
unplannedReceiptReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return unplannedReceiptReasonList
}
@@ -341,7 +343,7 @@ export function getUnPlannedIssuseReasonList(value) {
}
unplannedIssueReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return unplannedIssueReasonList
}
@@ -353,7 +355,7 @@ export function getScarpReasonList(value) {
}
scrapReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return scrapReasonList
}
diff --git a/common/label.js b/common/label.js
index 60824ee0..b720c6a6 100644
--- a/common/label.js
+++ b/common/label.js
@@ -14,7 +14,7 @@ export function getLabelInfo(scanMsg, callBack) {
let items = scanMsg.split(';');
let header = items[0];
let version = items[1];
- if (header != '' && version != '') {
+ if ((header != undefined) && (version!=undefined)) {
//解析扫描的是一维码还是二维码
let type = header.substring(header.length - 1, header.length);
if (type == 'Q') //qrcode
@@ -26,6 +26,18 @@ export function getLabelInfo(scanMsg, callBack) {
} else { //直接输入文本
getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
}
+ }else {
+ let labelResult = {
+ label: {
+ labelType: "",
+ barType: '',
+ code:""
+ },
+ package: null,
+ success: false,
+ message: '标签格式不正确',
+ }
+ callBack(labelResult);
}
}
@@ -38,12 +50,12 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) {
barType: 'QRCode',
},
package: {},
- sucess: true,
+ success: true,
message: ''
}
getLabelByHeader(header, version).then(res => {
if (res.data==null) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '未查找到标签头为[' + header + ']的标签类型';
callBack(labelResult);
} else {
@@ -57,7 +69,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) {
getLabelItems(newItem, scanMsg, callBack);
}
}).catch(err => {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = err;
callBack(err);
})
@@ -74,7 +86,7 @@ export function getLabelItems(labelItem, scanMsg, callBack) {
if (packingNumber != undefined) {
getPackageByNumber(packingNumber).then(pack => {
if (pack.data.list.length == 0) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '包装号[' + packingNumber + ']没有包装信息';
} else {
labelResult.package = pack.data.list[0];
@@ -82,12 +94,12 @@ export function getLabelItems(labelItem, scanMsg, callBack) {
}
callBack(labelResult);
}).catch(err => {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = err;
callBack(labelResult);
})
} else {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '在条码中未解析到箱码';
callBack(labelResult);
}
@@ -103,7 +115,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) {
barType: 'QRCode',
},
package: {},
- sucess: true,
+ success: true,
message: ''
}
@@ -112,7 +124,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) {
labelResult.message = "未读取到分隔符";
} else {
if (scanMsg.indexOf(separators) < 0) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = "标签格式不正确";
} else {
try {
@@ -153,7 +165,7 @@ export function getBarCodeInfo(header, version, value, callBack) {
code:value
},
package: null,
- sucess: true,
+ success: true,
message: '',
}
callBack(labelResult);
diff --git a/common/scan.js b/common/scan.js
index 93a3e8c5..73fe2759 100644
--- a/common/scan.js
+++ b/common/scan.js
@@ -13,12 +13,12 @@
//B:supplierBatch 供应商批次
//返回结果
-//sucess true:成功 false:失败
+//success true:成功 false:失败
//scanType barcode:条码 qrcode:二维码
//isPack true:箱码 false:托码
export function analyseScanInfo(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
data: {
isPack: null,
@@ -41,7 +41,7 @@ export function analyseScanInfo(scanMsg) {
console.log('1.扫描到的内容:', scanMsg);
//条码
if (scanMsg.indexOf(';') < 0) {
- scanResult.sucess = true;
+ scanResult.success = true;
scanResult.data.code = scanMsg;
scanResult.data.scanType = 'barcode'; //条码
} else {
@@ -107,15 +107,15 @@ export function analyseScanInfo(scanMsg) {
}
})
- scanResult.sucess = true;
+ scanResult.success = true;
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = true;
+ scanResult.success = true;
scanResult.data.code = scanMsg;
scanResult.data.scanType = 'barcode';
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
@@ -138,12 +138,12 @@ export function analyseScanInfo(scanMsg) {
//E:produceDate日期
//返回结果
-//sucess true:成功 false:失败
+//success true:成功 false:失败
//scanType barcode:条码 qrcode:二维码
//isPack true:箱码 false:托码
export function analyseProductLabelInfo(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
data: {
itemCode: null,
@@ -163,7 +163,7 @@ export function analyseProductLabelInfo(scanMsg) {
try {
//条码
if (scanMsg.indexOf(';') < 0) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签格式不正确";
} else {
let arrayItems = scanMsg.split(';');
@@ -211,13 +211,13 @@ export function analyseProductLabelInfo(scanMsg) {
scanResult.data.produceDate = value;
break;
default:
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "无法识别的前缀" + type;
break;
}
- scanResult.sucess = true;
+ scanResult.success = true;
} else {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签信息不能为空" + type;
}
}
@@ -225,12 +225,12 @@ export function analyseProductLabelInfo(scanMsg) {
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签分隔符错误";
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
@@ -243,7 +243,7 @@ export function analyseProductLabelInfo(scanMsg) {
//1.序号1,2.生产号2546311FL,3.零件号254FL004,4.批序号202207110009
export function analyseTJMesQRCode(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
items: []
};
@@ -252,7 +252,7 @@ export function analyseTJMesQRCode(scanMsg) {
} else {
try {
if (scanMsg.indexOf(':') < 0) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签格式不正确";
} else {
let arrayItems = scanMsg.split(':');
@@ -290,18 +290,18 @@ export function analyseTJMesQRCode(scanMsg) {
}
}
} else {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签信息不能为空";
}
})
- scanResult.sucess = true;
+ scanResult.success = true;
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签分隔符错误";
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 9616a0f8..573f2281 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -152,11 +152,12 @@
}
getLabelInfo(content, callback => {
let scanResult = callback;
- if (scanResult.sucess) {
+ if (scanResult.success) {
that.clear();
// that.getfocus();//不能自动获取焦点
that.$emit("getResult", scanResult);
} else {
+ that.clear();
this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
if (res) {
that.getfocus();
diff --git a/mycomponents/scan/winScanPack.vue b/mycomponents/scan/winScanPack.vue
index 82058c80..7b8c9daf 100644
--- a/mycomponents/scan/winScanPack.vue
+++ b/mycomponents/scan/winScanPack.vue
@@ -74,7 +74,7 @@
},
getScanResult(result) {
- if (result.sucess) {
+ if (result.success) {
this.$emit("getResult", result);
} else {
this.showMessage(result.message)
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index e3ec3242..62b61d78 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -139,6 +139,7 @@
this.$refs.popup.open('bottom');
this.fromInventoryStatuses = jobContent.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+ debugger
this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
},
diff --git a/pages.json b/pages.json
index 2b344fee..3e2f6fd0 100644
--- a/pages.json
+++ b/pages.json
@@ -1640,6 +1640,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/scrap/request/scrapRequestCreate",
+ "style": {
+ "navigationBarTitleText": "报废出库申请创建",
+ "enablePullDownRefresh": false
+ }
+ },
+
{
"path": "pages/pallet/record/bindPalletRecord",
"style": {
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index 2d57c1dd..b7f4e1ce 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -44,10 +44,13 @@
-
-
+
+
+
+
+
+
+
+
+ 报废原因 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue
new file mode 100644
index 00000000..b4c921f4
--- /dev/null
+++ b/pages/scrap/request/scrapRequestCreate.vue
@@ -0,0 +1,385 @@
+
+
+
+
+
+
+
+ 报废原因:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/scrap/request/scrapRrequest.vue b/pages/scrap/request/scrapRrequest.vue
index c5a84789..74b31979 100644
--- a/pages/scrap/request/scrapRrequest.vue
+++ b/pages/scrap/request/scrapRrequest.vue
@@ -34,11 +34,13 @@
updateTitle
} from '@/common/basic.js';
- import {
- getBusinessType,
- } from '@/common/record.js';
import {
getScrapRequestList,
+ scrapRequestApprove,
+ scrapRequestClose,
+ scrapRequestApproveAgree,
+ scrapRequestApproveRefused,
+ scrapRequestHandle
} from '@/api/request2.js';
import {
getDetailOption,
@@ -112,7 +114,6 @@
},
methods: {
- requestConfirm(action, item) {},
openRequestInfoPopup(item) {
this.$refs.requestInfoPopup.openPopup(item)
@@ -195,27 +196,45 @@
openScanDetailPopup() {
uni.navigateTo({
- url: "../record/scrapRecord?fromType=" + this.fromType
+ url: "./scrapRequestCreate"
})
},
swipeClick(e, dataContent) {
- if (e.content.text == "详情") {
- console.log("详情", dataContent.id)
+ var text = clearTirmAndWrap(e.content.text)
+ if (text == "详情") {
this.openRequestInfoPopup(dataContent);
- } else if (e.content.text == "处理") {
- console.log("处理")
- } else if (e.content.text == "审批") {
- console.log("审批")
- } else if (e.content.text == "审批通过") {
- console.log("审批通过")
- } else if (e.content.text == "审批驳回") {
- console.log("审批驳回")
- } else if (e.content.text == "关闭") {
- console.log("关闭")
+ } else if (text == "处理") {
+ this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+ this.scrapRequestHandle(dataContent.id)
+ })
+ } else if (text == "提交审批") {
+ this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+ this.scrapRequestApprove(dataContent.id)
+ })
+ } else if (text == "审批通过") {
+ this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+ this.scrapRequestApproveAgree(dataContent.id)
+ })
+ } else if (text == "审批驳回") {
+ this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+ this.scrapRequestApproveRefused(dataContent.id)
+ })
+ } else if (text == "关闭") {
+ this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+ this.scrapRequestClose(dataContent.id)
+ })
}
},
+ showQuestionMessage(hint,callBack){
+ this.$refs.comMessage.showQuestionMessage(hint,
+ res => {
+ if (res) {
+ callBack()
+ }
+ });
+ },
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
@@ -265,7 +284,83 @@
}
});
},
-
+ scrapRequestApprove(id) {
+ scrapRequestApprove(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请提交审批成功"
+ })
+ } else {
+ this.showMessage("申请提交审批失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+
+ },
+
+ scrapRequestClose(id) {
+ scrapRequestClose(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请关闭成功"
+ })
+ } else {
+ this.showMessage("申请关闭失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ scrapRequestApproveAgree(id) {
+ scrapRequestApproveAgree(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批通过成功"
+ })
+ } else {
+ this.showMessage("申请审批通过失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ scrapRequestApproveRefused(id) {
+ scrapRequestApproveRefused(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批驳回成功"
+ })
+ } else {
+ this.showMessage("申请审批驳回失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ scrapRequestHandle(id) {
+ scrapRequestHandle(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请处理成功"
+ })
+ } else {
+ this.showMessage("申请处理失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
}
}
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
new file mode 100644
index 00000000..aee41088
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -0,0 +1,254 @@
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+
+ 库位:
+
+ {{toLocationCode}}
+
+
+
+
+
+
+
+
+
+
+ 物料:
+
+ {{itemCode}}
+
+
+
+
+
+
+
+
+
+
+
+ 数量 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index acd0fae8..43ae3769 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -104,15 +104,14 @@
this.id = option.id;
if (this.id != undefined) {
// //新建的任务自动接收
- // if (option.status == "JOB_PENDING") {
- // this.receive((callback => {
- // this.received = true;
- // this.getDetail();
- // }));
- // } else {
- // this.getDetail();
- // }
- this.getDetail();
+ if (option.status == "1") {
+ this.receive((callback => {
+ this.received = true;
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
}
},
//返回首页
@@ -278,7 +277,7 @@
checkLocation() {
var isPass = true;
if (this.toLocationCode == "" || this.toLocationCode == null) {
- this.showMessageHint('请扫描收货库位', callback => {
+ this.showMessageHint('请扫描目标库位', callback => {
this.$refs.comScanLocation.showLocation();
})
@@ -311,17 +310,18 @@
this.managementList = res.list;
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
- // unPlannedReceiptJobSubmit(params).then(res => {
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成计划外入库记录" + res.data)
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // uni.hideLoading()
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
+ unPlannedReceiptJobSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data)
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
@@ -340,6 +340,8 @@
detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
+ detail.toLocationCode = this.toLocationCode
+ detail.toContainerNumber = '';
subList.push(detail)
}
})
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
index baa9f62a..a81d7470 100644
--- a/pages/unPlanned/record/issueRecord.vue
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -51,7 +51,6 @@
import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import {
- unPlannedIssueRequestSubmit,
unPlannedIssueRecordSubmit
} from '@/api/request2.js';
@@ -102,7 +101,6 @@
detailSource: [], //绑定在页面上的数据源
reason: "",
reasonList: [],
- fromType: "",
dataContent:{}
}
},
@@ -121,12 +119,6 @@
},
onLoad(option) {
- this.fromType = option.fromType
- if (this.fromType == "requestType") {
- updateTitle("计划外出库申请")
- } else {
- updateTitle("计划外出库记录")
- }
},
methods: {
@@ -223,24 +215,7 @@
this.showErrorMessage("请选择出库原因")
return;
}
-
- if(this.fromType=="requestType"){
- var params = this.setRequestParams();
- console.log("提交参数",JSON.stringify(params));
-
-
- // unPlannedIssueRequestSubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, )
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
- }else {
+ var params =this.setParams()
// unPlannedIssueRecordSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
@@ -252,7 +227,6 @@
// uni.hideLoading()
// this.showErrorMessage(error)
// })
- }
},
setParams() {
@@ -271,31 +245,6 @@
return subList;
},
- setRequestParams(){
- var subList = []
- var supplierCode=""
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- if(supplierCode==""){
- supplierCode = detail.package.supplierCode
- }
- subList.push(detail)
- }
- })
- })
-
- this.dataContent.subList = subList
- this.dataContent.supplierCode = supplierCode
- this.dataContent.businessType = "PurchasePutaway"
- this.dataContent.departmentCode= "研发部门";
- this.dataContent.status= 1 ;
- this.dataContent.autoCommit = "FALSE";
- this.dataContent.autoAgree = "FALSE";
- this.dataContent.autoExecute = "FALSE";
- this.dataContent.directCreateRecord = "FALSE";
- return this.dataContent;
- },
}
}
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
index f7e371cf..a05e811f 100644
--- a/pages/unPlanned/record/receiptRecord.vue
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -52,7 +52,6 @@
import comMessage from '@/mycomponents/common/comMessage.vue'
import {
- unPlannedReceiptRequestbSubmit,
unPlannedReceiptRecordbSubmit
} from '@/api/request2.js';
@@ -99,7 +98,6 @@
businessTypeCode: "UnplannedReceipt",
reason: "",
reasonList: [],
- fromType: "",
showToLoaction:true,
dataContent:{}
}
@@ -120,20 +118,9 @@
},
onLoad(option) {
- this.fromType = option.fromType
- this.updateTitle();
},
methods: {
- updateTitle(){
- if (this.fromType == "requestType") {
- updateTitle("计划外入库申请")
- this.showToLoaction =false
- } else {
- updateTitle("计划外入库记录")
- this.showToLoaction =true
- }
- },
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
@@ -249,21 +236,6 @@
return;
}
- if(this.fromType=="requestType"){
- var params = this.setRequestParams()
- console.log("提交" + JSON.stringify(params))
- // unPlannedReceiptRequestbSubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成计划外入库申请" + res.data, )
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
- }else {
//记录有目标库位,需要查询管理模式
var itemCodes = []
this.detailSource.forEach(item => {
@@ -292,7 +264,6 @@
this.showErrorMessage(res.message);
}
});
- }
},
setParams(queryModel) {
@@ -328,32 +299,6 @@
return this.dataContent;
},
- setRequestParams(){
- var subList = []
- var supplierCode=""
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- if(supplierCode==""){
- supplierCode = detail.package.supplierCode
- }
- subList.push(detail)
- }
- })
- })
-
- this.dataContent.subList = subList
- this.dataContent.supplierCode = supplierCode
- this.dataContent.businessType = "PurchasePutaway"
- this.dataContent.departmentCode= "研发部门";
- this.dataContent.status= 1 ;
- this.dataContent.autoCommit = "FALSE";
- this.dataContent.autoAgree = "FALSE";
- this.dataContent.autoExecute = "FALSE";
- this.dataContent.directCreateRecord = "FALSE";
- return this.dataContent;
- },
-
}
}
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
index ff2ffc7a..7d974e7d 100644
--- a/pages/unPlanned/request/issueRequest.vue
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -33,13 +33,19 @@
import {
goHome,
- updateTitle
+ updateTitle,
+ clearTirmAndWrap
} from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import {
getUnPlannedIssueRequestList,
+ unPlannedIssueRequestApprove,
+ unPlannedIssueRequestClose,
+ unPlannedIssueRequestApproveAgree,
+ unPlannedIssueRequestApproveRefused,
+ unPlannedIssueRequestHandle
} from '@/api/request2.js';
import {
getDetailOption,
@@ -82,7 +88,7 @@
this.detailOptions = getDetailOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
- this.detailAndHandleOption = getDetailAndHandleOption()
+ this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
},
@@ -204,21 +210,39 @@
},
swipeClick(e, dataContent) {
- if (e.content.text == "详情") {
- console.log("详情", dataContent.id)
+ var text = clearTirmAndWrap(e.content.text)
+ if (text == "详情") {
this.openRequestInfoPopup(dataContent);
- } else if (e.content.text == "处理") {
- console.log("处理")
- } else if (e.content.text == "审批") {
- console.log("审批")
- } else if (e.content.text == "审批通过") {
- console.log("审批通过")
- } else if (e.content.text == "审批驳回") {
- console.log("审批驳回")
- } else if (e.content.text == "关闭") {
- console.log("关闭")
+ } else if (text == "处理") {
+ this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+ this.unPlannedIssueRequestHandle(dataContent.id)
+ })
+ } else if (text == "提交审批") {
+ this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+ this.unPlannedIssueRequestApprove(dataContent.id)
+ })
+ } else if (text == "审批通过") {
+ this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+ this.unPlannedIssueRequestApproveAgree(dataContent.id)
+ })
+ } else if (text == "审批驳回") {
+ this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+ this.unPlannedIssueRequestApproveRefused(dataContent.id)
+ })
+ } else if (text == "关闭") {
+ this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+ this.unPlannedIssueRequestClose(dataContent.id)
+ })
}
},
+ showQuestionMessage(hint,callBack){
+ this.$refs.comMessage.showQuestionMessage(hint,
+ res => {
+ if (res) {
+ callBack()
+ }
+ });
+ },
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@@ -267,6 +291,84 @@
}
});
},
+
+ unPlannedIssueRequestApprove(id) {
+ unPlannedIssueRequestApprove(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请提交审批成功"
+ })
+ } else {
+ this.showMessage("申请提交审批失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+
+ },
+
+ unPlannedIssueRequestClose(id) {
+ unPlannedIssueRequestClose(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请关闭成功"
+ })
+ } else {
+ this.showMessage("申请关闭失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ unPlannedIssueRequestApproveAgree(id) {
+ unPlannedIssueRequestApproveAgree(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批通过成功"
+ })
+ } else {
+ this.showMessage("申请审批通过失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ unPlannedIssueRequestApproveRefused(id) {
+ unPlannedIssueRequestApproveRefused(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请审批驳回成功"
+ })
+ } else {
+ this.showMessage("申请审批驳回失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
+ unPlannedIssueRequestHandle(id) {
+ unPlannedIssueRequestHandle(id).then(res => {
+ if (res.data) {
+ this.getList("refresh")
+ uni.showToast({
+ title: "申请处理成功"
+ })
+ } else {
+ this.showMessage("申请处理失败")
+ }
+
+ }).catch(error => {
+ this.showMessage(error)
+ })
+ },
}
}
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
index baa9f62a..4e96ea9f 100644
--- a/pages/unPlanned/request/issueRequestCreate.vue
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -3,36 +3,42 @@
-
-
-
-
-
-
-
-
-
+
+
+ 出库原因:
+
+
+
-
-
-
-
-