diff --git a/src/api/model/pm.js b/src/api/model/pm.js index f7fd7f5a..698b0421 100644 --- a/src/api/model/pm.js +++ b/src/api/model/pm.js @@ -245,5 +245,13 @@ export default { ); } }, + submit:{ + name: "提交", + req: async function(id){ + return await http.post( + `${config.API_URL}/pm/utask/${id}/submit/`, + ); + } + }, } } \ No newline at end of file diff --git a/src/views/pm/utask.vue b/src/views/pm/utask.vue index 55ef5709..bb1e9b41 100644 --- a/src/views/pm/utask.vue +++ b/src/views/pm/utask.vue @@ -153,6 +153,15 @@ > 编辑 + + 提交 + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./mlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "白片抛", mgroupId: "", diff --git a/src/views/wpm_gx/chaoxi.vue b/src/views/wpm_gx/chaoxi.vue index fa8248dc..261cffb8 100644 --- a/src/views/wpm_gx/chaoxi.vue +++ b/src/views/wpm_gx/chaoxi.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "一次超洗", mgroupId: "", diff --git a/src/views/wpm_gx/chaoxi2.vue b/src/views/wpm_gx/chaoxi2.vue index 34a26727..298fa95b 100644 --- a/src/views/wpm_gx/chaoxi2.vue +++ b/src/views/wpm_gx/chaoxi2.vue @@ -25,7 +25,9 @@ :mgroupName="mgroupName" > - + + + @@ -35,12 +37,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "二次超洗", mgroupId: "", diff --git a/src/views/wpm_gx/chaoxi3.vue b/src/views/wpm_gx/chaoxi3.vue index 8e8e53b9..89831588 100644 --- a/src/views/wpm_gx/chaoxi3.vue +++ b/src/views/wpm_gx/chaoxi3.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "三次超洗", mgroupId: "", diff --git a/src/views/wpm_gx/chengpinpao.vue b/src/views/wpm_gx/chengpinpao.vue index 5eefabab..c456d1b0 100644 --- a/src/views/wpm_gx/chengpinpao.vue +++ b/src/views/wpm_gx/chengpinpao.vue @@ -25,7 +25,9 @@ :mgroupName="mgroupName" > - + + + @@ -35,12 +37,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "成品抛", mgroupId: "", diff --git a/src/views/wpm_gx/daojiao.vue b/src/views/wpm_gx/daojiao.vue index 04c6b039..57e99b77 100644 --- a/src/views/wpm_gx/daojiao.vue +++ b/src/views/wpm_gx/daojiao.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "倒角", mgroupId: "", diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 00fad594..75319b36 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -106,6 +106,7 @@ placeholder="交接物料" clearable class="width100" + @change="changeMaterial" > @@ -143,6 +146,7 @@ :min="0" class="width100" controls-position="right" + @change = "countUseChange" /> @@ -153,8 +157,9 @@ :min="0" class="width100" controls-position="right" - @change="countChanges" + disabled /> + @@ -392,6 +397,7 @@ export default { work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},], route: [{required: true,message: "请选择工艺路线",trigger: "blur",},] }, + materialCount:1, material_in:'', material_out:'', shiftOtions:[], @@ -465,6 +471,16 @@ export default { that.materialOptions = res; }); }, + changeMaterial(val){ + let that = this; + that.materialOptions.forEach(item=>{ + if(item.id == val){ + that.materialCount = item.count; + that.form.count_use = item.count; + that.form.count_real = item.count-that.form.count_pn_jgqbl; + } + }) + }, //显示 open(mode = "add") { this.mode = mode; @@ -476,6 +492,11 @@ export default { console.log("data", data); Object.assign(this.form, data); }, + countUseChange(){ + let that = this; + that.form.count_real = that.form.count_use - that.form.count_pn_jgqbl; + that.form.count_ok = that.form.count_real - that.form.count_notok; + }, countChange() { this.form.count_notok = this.form.count_n_hs + diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 73fc51e5..b49d7965 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -83,6 +83,7 @@ placeholder="接收工段" clearable style="width: 100%" + :disabled="type==40" @change="getUserList2" > { - this.mgroupOptions = res; + let that = this; + that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { + that.mgroupOptions = res; + if(that.type==40){ + res.forEach(item=>{ + if(item.name=="废品库"){ + that.form.recive_mgroup = item.id; + } + }) + that.getCkUserList();//废品库接收人 + } }); }, //获取车间物料 @@ -401,6 +409,14 @@ export default { that.userList = res; }); }, + //获取仓库人员 + getCkUserList() { + let that = this; + this.$API.system.user.list.req({ page: 0, posts__code: "inm&check" }) + .then((res) => { + that.userList2 = res; + }); + }, //获取接收工段人员 getUserList2() { let that = this; diff --git a/src/views/wpm_gx/heihua.vue b/src/views/wpm_gx/heihua.vue index 1a708034..c925c624 100644 --- a/src/views/wpm_gx/heihua.vue +++ b/src/views/wpm_gx/heihua.vue @@ -25,7 +25,9 @@ :mgroupName="mgroupName" > - + + + @@ -35,12 +37,13 @@ import inm from "./inm.vue"; import mlogs from "./mlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "黑化", mgroupId: "", diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 4c8ad176..14368946 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -74,15 +74,11 @@ prop="count" min-width="80" > - + - + 提交 + + + + {{form.number}} + + + {{typeDict[form.type]}} + + + {{stateDict[form.state]}} + + + {{form.belong_dept_name}}-{{ form.mgroup_name }} + + + {{form.do_user_name}} + + + {{form.create_time}} + + +
+ + + + + + + + + + + + + + + + + + + +
@@ -191,19 +280,20 @@ diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue index c2b85a8a..ad15dbd0 100644 --- a/src/views/wpm_gx/jianbo.vue +++ b/src/views/wpm_gx/jianbo.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + +
@@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "减薄A", mgroupId: "", diff --git a/src/views/wpm_gx/jianbob.vue b/src/views/wpm_gx/jianbob.vue index b7624b56..568cc088 100644 --- a/src/views/wpm_gx/jianbob.vue +++ b/src/views/wpm_gx/jianbob.vue @@ -25,7 +25,9 @@ :mgroupName="mgroupName" > - + + + @@ -35,12 +37,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "减薄B", mgroupId: "", diff --git a/src/views/wpm_gx/jingdiao.vue b/src/views/wpm_gx/jingdiao.vue index cacf4ada..5fe66764 100644 --- a/src/views/wpm_gx/jingdiao.vue +++ b/src/views/wpm_gx/jingdiao.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover ,record}, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "精雕", mgroupId: "", diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue index 1988896a..dfaef602 100644 --- a/src/views/wpm_gx/mtask.vue +++ b/src/views/wpm_gx/mtask.vue @@ -131,11 +131,10 @@ export default { type: "warning", }).then(() => { this.$API.pm.mtask.submit.req(row.id).then((res) => { - this.$message.success("操作成功"); - this.$refs.table_mtask.refresh(); - this.mtaskClick(this.currentMtask); - }) - .catch((err) => {}); + this.$message.success("操作成功"); + this.$refs.table.refresh(); + this.mtaskClick(this.currentMtask); + }).catch((err) => {}); }); }, mtask_deliver(row){ diff --git a/src/views/wpm_gx/pingmo.vue b/src/views/wpm_gx/pingmo.vue index 1ef49570..a0d75931 100644 --- a/src/views/wpm_gx/pingmo.vue +++ b/src/views/wpm_gx/pingmo.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "平磨", mgroupId: "", diff --git a/src/views/wpm_gx/qiepian.vue b/src/views/wpm_gx/qiepian.vue index 1c1d319a..7050f11d 100644 --- a/src/views/wpm_gx/qiepian.vue +++ b/src/views/wpm_gx/qiepian.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./mlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "切片", mgroupId: "", diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue index b6304bf0..488d9a6b 100644 --- a/src/views/wpm_gx/saobian.vue +++ b/src/views/wpm_gx/saobian.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "扫边A", mgroupId: "", diff --git a/src/views/wpm_gx/saobianb.vue b/src/views/wpm_gx/saobianb.vue index dfd613b9..aac80990 100644 --- a/src/views/wpm_gx/saobianb.vue +++ b/src/views/wpm_gx/saobianb.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./fmlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "扫边B", mgroupId: "", diff --git a/src/views/wpm_gx/tuihuo.vue b/src/views/wpm_gx/tuihuo.vue index cf62c481..b8fdf617 100644 --- a/src/views/wpm_gx/tuihuo.vue +++ b/src/views/wpm_gx/tuihuo.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./mlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "退火", mgroupId: "", diff --git a/src/views/wpm_gx/yicipao.vue b/src/views/wpm_gx/yicipao.vue index 5ec87317..f829510d 100644 --- a/src/views/wpm_gx/yicipao.vue +++ b/src/views/wpm_gx/yicipao.vue @@ -25,7 +25,8 @@ :mgroupName="mgroupName" > - + + @@ -35,12 +36,13 @@ import inm from "./inm.vue"; import mlogs from "./mlogs.vue"; import mtask from "./mtask.vue"; import handover from "./handover.vue"; +import record from "./inmrecord.vue"; export default { - components: { inm, mlogs, mtask, handover }, + components: { inm, mlogs, mtask, handover,record }, data() { return { tableHieght: 200, - options: ["日志", "交接记录", "库存"], + options: ["日志", "交接记录", "库存","入库记录"], values: "日志", mgroupName: "一次抛", mgroupId: "",