diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 464f883..dec4ee0 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -153,6 +153,18 @@ export function reportSap(workorderCode) {
data: data
});
}
+//报工撤销按钮
+export function reportSapCancel(workorderCode) {
+ const data = {
+ workorderCode
+ }
+ return request({
+ url: '/mes/reportWork/reportSapCancel',
+ method: 'put',
+ data: data
+ });
+}
+
// 查询物料管理列表
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 27ebf58..c30f892 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -127,7 +127,17 @@
v-hasPermi="['mes:reportWork:edit']"
>报工SAP
-
+
+ 撤销报工SAP
+
import { listReportWork, getReportWork, delReportWork, addReportWork, getWorkcenterList,
- updateReportWork,reportSap,getBatchList,
+ updateReportWork,reportSap,getBatchList,reportSapCancel,
getReportList,getReportSAPList,submitReportPS,submitReportPSSAP,getCKList} from "@/api/mes/reportWork";
import { getConsumeList,submitConsumePS,submitReportInfo} from "@/api/mes/reportWorkConsume";
import ReportWorkConsume from "./reportWorkConsume.vue";
@@ -1061,6 +1071,25 @@ export default {
});
},
+ /**报工撤销sap。报工状态回退**/
+ handleReportCancel(){
+ this.loading = true;
+ let sr = this.selectRow[0];
+ const code = sr.workorderCode;
+ let _this = this;
+ this.$modal.confirm('是否确认工单"' + code + '"的数据项撤销sap报工？').then(function() {
+ reportSapCancel(code).then(response => {
+ if(response !=null && response.code ==200){
+ _this.$modal.msgSuccess("报工撤销成功");
+ }
+ _this.loading = false;
+ });
+ }).then(() => {
+
+ }).catch(() => {
+
+ });
+ },
/** 报工详情按钮操作 */
handleReportHz(row) {
@@ -1137,14 +1166,7 @@ export default {
/** 报工损耗按钮操作 */
handleConsumeHz(row) {
this.reset();
- let sr = row;
-
- if(sr.uploadStatus =='sap报工成功'){
- this.optType = 'view'
- }else{
- this.optType = ''
- }
-
+ let sr = this.selectRow[0];
this.queryParams.workorderCode = sr.workorderCode;
//查询母工单报工记录列表
this.queryParams.parentOrder = '0';
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index fa9c0e6..3adfa1d 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -94,7 +94,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['quality:unqualified:edit']"
- >提交OA
+ >发起OA流程
-
+
-
+
-
+
-
+
-
-
-
+
@@ -207,7 +205,7 @@
-
+
@@ -226,9 +224,7 @@
-
-
-
+
@@ -251,7 +247,6 @@
-
@@ -266,9 +261,16 @@
+
+
+
+
+
+
+
-
+
@@ -331,6 +333,9 @@ export default {
form: {},
// 表单校验
rules: {
+ remark: [
+ { required: true, message: "不良描述不能为空", trigger: "blur" }
+ ],
},
checkTypeList:[],
checkTypes:[]
@@ -441,19 +446,11 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- if (this.form.id != null) {
- updateUnqualified(this.form).then(response => {
- this.$modal.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- });
- } else {
- addUnqualified(this.form).then(response => {
- this.$modal.msgSuccess("新增成功");
- this.open = false;
- this.getList();
- });
- }
+ updateUnqualified(this.form).then(response => {
+ this.$modal.msgSuccess("提交OA成功");
+ this.open = false;
+ this.getList();
+ });
}
});
},