@@ -398,7 +410,7 @@
@@ -645,7 +657,7 @@ import {
submitReportPS,
submitReportPSSAP,
getCKList,
- getPutInOrderList,
+ getPutInOrderList,preReportRow
} from "@/api/mes/reportWork";
import {
getConsumeList,
@@ -1227,7 +1239,7 @@ export default {
this.pReportRows = allRows.reduce((acc, cur) => {
const hasDuplicate = acc.some(
(item) =>
- item.batch === cur.batch && item.workorderCode === cur.workorderCode
+ item.batch === cur.batch && item.workorderCode === cur.workorderCode && item.reportCode === cur.reportCode
);
if (!hasDuplicate) {
acc.push(cur);
@@ -1257,7 +1269,7 @@ export default {
this.pReportRows = allRows.reduce((acc, cur) => {
const hasDuplicate = acc.some(
(item) =>
- item.batch === cur.batch && item.workorderCode === cur.workorderCode
+ item.batch === cur.batch && item.workorderCode === cur.workorderCode && item.reportCode === cur.reportCode
);
if (!hasDuplicate) {
acc.push(cur);
@@ -1545,12 +1557,37 @@ export default {
}).catch(() => {});
},
+ //报工详情表格--预报工
+ preReportRow(index, rows) {
+ let _this = this;
+ this.$modal.confirm('是否确认预报工?').then(function() {
+ _this.loading = true;
+ return preReportRow(rows[index].reportCode);
+ }).then(() => {
+ this.$modal.msgSuccess("预报工成功");
+ debugger
+ var sr = rows[index];
+ this.queryParams.workorderCode = sr.workorderCode;
+ this.queryParams.machineCode = sr.machineCode;
+ //查询工单报工记录列表
+ getAllLevelReportList(this.queryParams).then((response) => {
+ this.queryParams.workorderCode = "";
+ this.queryParams.machineCode = "";
+ this.openReport = true;
+ this.titleReport = "工单报工详情";
+ this.libTabs = response;
+ });
+ _this.loading = false;
+ }).catch(() => {});
+ },
+
//物料损耗表格--删除
deleteBomRow(index, rows) {
this.$modal
.confirm("是否确认删除?确认后,不需要点击下方确定,立马删除!")
.then(function () {
if (rows[index].recordId != null) {
+ this.loading = true;
return deleteBomRowNow(rows[index].recordId);
}
})
@@ -1567,6 +1604,7 @@ export default {
this.pConsumeRows = newPConsumeRows;
rows.splice(index, 1);
this.$modal.msgSuccess("删除成功");
+ this.loading = false;
})
.catch(() => {});
},
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 8ffce62..4ea8f9f 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -905,13 +905,7 @@ export default {
],
batchQuantity: [
{required: true, message: "当前批次数量不能为空", trigger: "blur"}
- ],
- newBatchCode: [
- {required: true, message: "新批次编码不能为空", trigger: "blur"}
- ],
- newBatchQuantity: [
- {required: true, message: "新批次数量不能为空", trigger: "blur"}
- ],
+ ]
},
/**********************************/
eRouteProps: {multiple: true},
diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index 19636b4..2dfe97e 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -17,13 +17,15 @@
@keyup.enter.native="handleQuery"
/>
-
-
+
+
+
+
+
@@ -32,17 +34,7 @@
-
-
- {{ item.projectTypeName }}
-
-
-
+
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 987d28b..7d6a24a 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -758,6 +758,7 @@ export default {
this.form.quality = obj.quality;
this.form.unit = obj.unit;
this.form.incomeTime = obj.incomeTime;
+ this.form.checkLoc = obj.checkLocName;
getBatchList(obj.workorderCode).then(response => {
this.batchList = response;
});
diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue
index 783ed5d..da86777 100644
--- a/src/views/quality/qcProduce/selectWorkOrder.vue
+++ b/src/views/quality/qcProduce/selectWorkOrder.vue
@@ -32,6 +32,7 @@
+
{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 0dc5cac..6611288 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -1,6 +1,18 @@
+
+
+
+
+
+
+
- -->
+
-
+ -->
修改
-
+
-
+
+
-
-
-
+
+
+
{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -205,14 +218,6 @@
@click="handleCheckProject(scope.row)"
v-hasPermi="['quality:qcWarehousing:edit']"
>检验
-
@@ -321,6 +326,7 @@
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -370,11 +387,16 @@
ref="itemSelectMaterial"
@onSelected="onSelectMaterial"
>
-
+
+
+
{
this.batchList = response;
});
@@ -691,6 +716,16 @@ export default {
this.form.materialName = obj.name;
},
+ /**工作中心选择弹出框**/
+ handleSelectWorkCenter() {
+ this.$refs.itemSelectWorkCenter.showFlag = true;
+ },
+ //工作中心选择确认
+ onSelectWorkCenter(obj) {
+ this.form.supplierCode = obj.code;
+ this.form.supplierName = obj.name;
+ },
+
/**仓库选择弹出框**/
handleSelectLoc() {
this.$refs.itemSelectLoc.showFlag = true;