diff --git a/src/views/bigScreen/bxerp/jiejingdept.vue b/src/views/bigScreen/bxerp/jiejingdept.vue
index ce2cb6ea..0e6d9a44 100644
--- a/src/views/bigScreen/bxerp/jiejingdept.vue
+++ b/src/views/bigScreen/bxerp/jiejingdept.vue
@@ -17,8 +17,8 @@
@@ -284,14 +284,14 @@ export default {
],
persons: [
- { name: '张三', val: 920, color: '#4fc3f7' },
- { name: '李四', val: 796, color: '#ff6b6b' },
- { name: '王五', val: 734, color: '#00e5ff' },
- { name: '赵六', val: 661, color: '#ffc107' },
- { name: '钱七', val: 594, color: '#bb86fc' },
- { name: '孙八', val: 508, color: '#4fc3f7' },
- { name: '周九', val: 438, color: '#ff6b6b' },
- { name: '吴十', val: 360, color: '#69f0ae' },
+ { name: '郭香林', val: 920, color: '#4fc3f7' },
+ { name: '于浩洋', val: 796, color: '#ff6b6b' },
+ { name: '张明杰', val: 734, color: '#00e5ff' },
+ { name: '裴仁强', val: 661, color: '#ffc107' },
+ { name: '曾玉明', val: 594, color: '#bb86fc' },
+ { name: '朱凯', val: 508, color: '#4fc3f7' },
+ { name: '夏春立', val: 438, color: '#ff6b6b' },
+ { name: '李学文', val: 360, color: '#69f0ae' },
],
equipments: [
diff --git a/src/views/bigScreen/bxerp/jiejingdept2.vue b/src/views/bigScreen/bxerp/jiejingdept2.vue
index d4a4bce7..9a4c4866 100644
--- a/src/views/bigScreen/bxerp/jiejingdept2.vue
+++ b/src/views/bigScreen/bxerp/jiejingdept2.vue
@@ -240,16 +240,16 @@ export default {
],
persons: [
- { name: '张三', val: 860, color: '#4fc3f7', av: '张' },
- { name: '李四', val: 742, color: '#ff6b6b', av: '李' },
- { name: '王五', val: 698, color: '#00e5ff', av: '王' },
- { name: '赵六', val: 631, color: '#ffc107', av: '赵' },
- { name: '钱七', val: 570, color: '#bb86fc', av: '钱' },
- { name: '孙八', val: 488, color: '#4fc3f7', av: '孙' },
- { name: '周九', val: 412, color: '#ff6b6b', av: '周' },
- { name: '吴十', val: 344, color: '#69f0ae', av: '吴' },
- { name: '郑十一', val: 295, color: '#ffc107', av: '郑' },
- { name: '冯十二', val: 260, color: '#bb86fc', av: '冯' },
+ { name: '谭瑶', val: 860, color: '#4fc3f7', av: '谭' },
+ { name: '武月会', val: 742, color: '#ff6b6b', av: '武' },
+ { name: '赵凤云', val: 698, color: '#00e5ff', av: '赵' },
+ { name: '李占营', val: 631, color: '#ffc107', av: '李' },
+ { name: '陈新艳', val: 570, color: '#bb86fc', av: '陈' },
+ { name: '朱芳丽', val: 488, color: '#4fc3f7', av: '朱' },
+ { name: '陈圆', val: 412, color: '#ff6b6b', av: '陈' },
+ { name: '刘春亮', val: 344, color: '#69f0ae', av: '刘' },
+ { name: '朱晓兴', val: 295, color: '#ffc107', av: '朱' },
+ { name: '程雪佩', val: 260, color: '#bb86fc', av: '程' },
],
equipments: [
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index bb25c2e2..7d4fd8f4 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -13,7 +13,7 @@
:model="form"
:rules="rules"
label-position="right"
- label-width="100px"
+ label-width="110px"
style="padding: 0 10px"
>
@@ -97,6 +97,13 @@
>
+
+
+
+
+
+
+
+
@@ -70,6 +73,7 @@
commands: "",
coder_ip: "",
coder_port: 3100,
+ coder_field: "1",
};
export default {
name: 'labeltemplate',
@@ -154,6 +158,7 @@
this.addForm.commands=row.commands.join("\n");
this.addForm.coder_ip=row.coder_ip;
this.addForm.coder_port=row.coder_port;
+ this.addForm.coder_field=row.coder_field || "1";
this.limitedVisible = true;
},
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 749d4a44..d04f7670 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -224,11 +224,18 @@
-
+
请手动录入新批次号，不要用已有批次！
+
+
+
+ 源批次缺陷不一致，勾选后合并批次将清除缺陷标记
+
+
+
@@ -308,7 +315,8 @@ export default {
recive_user: null,
recive_mgroup: null,
handoverb:[],
- new_batch:''
+ new_batch:'',
+ clear_defect: false
},
rules: {
new_batch:[
@@ -457,6 +465,25 @@ export default {
}
that.getMgroupOptions();
},
+ computed: {
+ // 合批时源批次 state 均为 OK(10) 且 defect 不一致，才显示"清除缺陷"勾选
+ defectMismatch() {
+ if (this.mtype !== 30) return false;
+ if (this.new_wm) return false;
+ const items = this.form.handoverb || [];
+ if (items.length < 2) return false;
+ if (!items.every(i => Number(i.state) === 10)) return false;
+ const defectIds = new Set(items.map(i => i.defect == null ? null : i.defect));
+ return defectIds.size > 1;
+ }
+ },
+ watch: {
+ defectMismatch(val) {
+ if (!val) {
+ this.form.clear_defect = false;
+ }
+ }
+ },
methods: {
deletebw(index){
let that = this;
@@ -656,6 +683,7 @@ export default {
if(mtype!==undefined&&mtype!==null){
that.mtype = mtype;
}
+ that.form.clear_defect = false;
that.checkedStatus=[];
that.selectItems=[];
if(mtype==30){
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index 10831004..c36ca657 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -517,6 +517,7 @@ export default {
let obj = {};
obj.id = item.id;
obj.wm = item.id;
+ obj.state = item.state;
obj.batch = item.batch;
obj.process = item.material_.process_name;
obj.count_canhandover = item.count_canhandover;
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 4bd10c2b..17382fc7 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -58,7 +58,11 @@
{{ wmState[mlogItem.wm_in_state]?.text }}
-
+
+
+ 合格B类不拆批
+
+
-
+
-
+
-
+
-
+
-
+
+
+ 合格B类不拆批
+
+
Array.isArray(row.mlogbdefect)
+ && row.mlogbdefect.some(d => Number(d.defect_okcate) === 20 && Number(d.count) > 0));
+ },
+ },
data() {
return {
wmState,
@@ -638,11 +650,25 @@ export default {
//表单提交方法
mlogSubmit() {
let that = this;
- that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => {
- that.isSaveing = false;
- that.visible = false;
- that.$message.success("操作成功");
- });
+ that.isSaveing = true;
+ const doSubmit = () => {
+ that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => {
+ that.isSaveing = false;
+ that.visible = false;
+ that.$message.success("操作成功");
+ }).catch(() => {
+ that.isSaveing = false;
+ });
+ };
+ if (that.hasOkBDefect) {
+ that.$API.wpm.mlog.change.req(that.mlogItem.id, { clear_defect: !!that.mlogItem.clear_defect }).then(() => {
+ doSubmit();
+ }).catch(() => {
+ that.isSaveing = false;
+ });
+ } else {
+ doSubmit();
+ }
},
// //渲染工单提交按钮
// getInit() {