Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
1dc5710f84
|
|
@ -245,5 +245,13 @@ export default {
|
|||
);
|
||||
}
|
||||
},
|
||||
submit:{
|
||||
name: "提交",
|
||||
req: async function(id){
|
||||
return await http.post(
|
||||
`${config.API_URL}/pm/utask/${id}/submit/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
@ -153,6 +153,15 @@
|
|||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click.stop="table_submit(scope.row)"
|
||||
v-if="scope.row.state == 30"
|
||||
v-auth="'utask.submit'"
|
||||
>
|
||||
提交
|
||||
</el-button>
|
||||
<el-popconfirm
|
||||
title="确定删除吗？"
|
||||
@confirm.stop="table_del(scope.row)"
|
||||
|
|
@ -172,10 +181,7 @@
|
|||
<el-popconfirm
|
||||
title="确定停止/恢复该任务吗？"
|
||||
@confirm.stop="table_toggle(scope.row)"
|
||||
v-if="
|
||||
scope.row.state == 30 ||
|
||||
scope.row.state == 34
|
||||
"
|
||||
v-if="scope.row.state == 30 ||scope.row.state == 34"
|
||||
v-auth="'utask.toggle'"
|
||||
>
|
||||
<template #reference>
|
||||
|
|
@ -385,6 +391,12 @@ export default {
|
|||
return err;
|
||||
});
|
||||
},
|
||||
table_submit(row){
|
||||
this.$API.pm.utask.submit.req(row.id).then(res=>{
|
||||
this.$message.success("提交成功");
|
||||
this.$refs.table.refresh();
|
||||
}).catch(err=>{})
|
||||
},
|
||||
table_toggle(row) {
|
||||
this.$API.pm.utask.toggle
|
||||
.req(row.id)
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
v-model="form.count"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:max="formCount"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCheckChange"
|
||||
></el-input-number>
|
||||
|
|
@ -525,6 +526,7 @@ export default {
|
|||
this.count_notok_json.count_n_qp=
|
||||
this.count_notok_json.count_n_swen=
|
||||
this.count_notok_json.count_n_zb=
|
||||
this.count_notok_json.count_n_bb=
|
||||
this.count_notok_json.count_n_zq=
|
||||
this.count_notok_json.count_n_hs=
|
||||
this.count_notok_json.count_n_md=
|
||||
|
|
@ -548,6 +550,7 @@ export default {
|
|||
this.count_notok_json.count_n_z+
|
||||
this.count_notok_json.count_n_swen+
|
||||
this.count_notok_json.count_n_zb+
|
||||
this.count_notok_json.count_n_bb+
|
||||
this.count_notok_json.count_n_zq+
|
||||
this.count_notok_json.count_n_hs+
|
||||
this.count_notok_json.count_n_md+
|
||||
|
|
|
|||
|
|
@ -54,10 +54,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="设备名称" prop="设备名称" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
</template>
|
||||
<el-table-column label="日期" prop="日期">
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
|
|
@ -116,7 +113,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -176,7 +173,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -236,7 +233,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -296,7 +293,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -356,7 +353,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -416,7 +413,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -476,7 +473,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -536,7 +533,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -596,7 +593,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -656,7 +653,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -716,7 +713,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -776,7 +773,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -836,7 +833,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -896,7 +893,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -956,7 +953,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
|
|
@ -1083,17 +1080,16 @@ export default {
|
|||
let dateArr = [];
|
||||
for (let i = 0; i < 7; i++) {
|
||||
let itemDate = new Date(first.getTime() + i * ondDayTime);
|
||||
let item = itemDate.getDate();
|
||||
let item = itemDate.toISOString().split('T')[0];
|
||||
dateArr.push(item);
|
||||
}
|
||||
that.weekDateList = dateArr;
|
||||
console.log('dateArr',dateArr);
|
||||
that.query.start_date =first.getFullYear() +"-" +(first.getMonth() + 1) +"-" +first.getDate();
|
||||
that.query.end_date =last.getFullYear() +"-" +(last.getMonth() + 1) +"-" +last.getDate();
|
||||
// console.log('dateArr',dateArr);
|
||||
that.query.start_date =first.toISOString().split('T')[0];
|
||||
that.query.end_date =last.toISOString().split('T')[0];
|
||||
that.options.forEach((item,index)=>{
|
||||
that.getData(item,index);
|
||||
})
|
||||
|
||||
},
|
||||
setChart(name, option = null) {
|
||||
// 根据name 渲染数据, option需填写，否则option为模拟数据
|
||||
|
|
@ -1161,8 +1157,8 @@ export default {
|
|||
});
|
||||
for(let i = 0;i<dataList.length;i++){
|
||||
for(let j = 0;j<dataList[i].length;j++){
|
||||
let index = that.weekDateList.indexOf(dataList[i][j].日);
|
||||
datas[i][index] = dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
|
||||
let index = that.weekDateList.indexOf(dataList[i][j].日期);
|
||||
datas[i][index] += dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
|
||||
}
|
||||
}
|
||||
for(let n=0;n<nameList.length;n++){
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@
|
|||
placeholder="交接物料"
|
||||
clearable
|
||||
class="width100"
|
||||
@change="changeMaterial"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in materialOptions"
|
||||
|
|
@ -131,8 +132,10 @@
|
|||
<el-input-number
|
||||
v-model="form.count_use"
|
||||
:min="1"
|
||||
:max="materialCount"
|
||||
controls-position="right"
|
||||
class="width100"
|
||||
@change = "countUseChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -143,6 +146,7 @@
|
|||
:min="0"
|
||||
class="width100"
|
||||
controls-position="right"
|
||||
@change = "countUseChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -153,8 +157,9 @@
|
|||
:min="0"
|
||||
class="width100"
|
||||
controls-position="right"
|
||||
@change="countChanges"
|
||||
disabled
|
||||
/>
|
||||
<!-- countChanges -->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
|
|
@ -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 +
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@
|
|||
placeholder="接收工段"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
:disabled="type==40"
|
||||
@change="getUserList2"
|
||||
>
|
||||
<el-option
|
||||
|
|
@ -313,10 +314,17 @@ export default {
|
|||
},
|
||||
//获取工段列表
|
||||
getMgroupOptions() {
|
||||
this.$API.mtm.mgroup.list
|
||||
.req({ page: 0})
|
||||
.then((res) => {
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -74,15 +74,11 @@
|
|||
prop="count"
|
||||
min-width="80"
|
||||
></el-table-column>
|
||||
<!-- <el-table-column
|
||||
v-if="mgroupName=='size'||mgroupName=='facade'"
|
||||
label="检验状态"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag type="success" v-if="scope.row.count_xtest == null">已检验</el-tag>
|
||||
<el-tag type="primary" v-else>未检验 </el-tag>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
label="生产中"
|
||||
prop="count_working"
|
||||
min-width="80"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="不合格标记"
|
||||
prop="notok_sign_name"
|
||||
|
|
@ -157,6 +153,7 @@
|
|||
v-if="dialog.inmRecord"
|
||||
ref="inmRecordDialog"
|
||||
:cate = "cate_type"
|
||||
:process = "process"
|
||||
:mgroupId = "params.mgroupx"
|
||||
:deptId = " params.belong_dept"
|
||||
@success="handleinmSuccess"
|
||||
|
|
@ -208,6 +205,7 @@ export default {
|
|||
material: "",
|
||||
},
|
||||
cate_type:'',
|
||||
process:'',
|
||||
materialType: "wm",
|
||||
visibleDrawer: false,
|
||||
};
|
||||
|
|
@ -240,6 +238,7 @@ export default {
|
|||
}
|
||||
that.mgroupId = res[0].id;
|
||||
that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
|
||||
that.process = res[0].process;
|
||||
that.params.mgroupx = res[0].id;
|
||||
that.params.belong_dept = res[0].belong_dept;
|
||||
that.apiObj = that.$API.wpm.wmaterial.list;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
<el-drawer
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
:size="'90%'"
|
||||
:size="'80%'"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container>
|
||||
<el-container v-if="mode != 'show'">
|
||||
<el-header>
|
||||
<el-steps
|
||||
:active="active"
|
||||
|
|
@ -177,12 +177,101 @@
|
|||
<el-button @click="table_submit" type="warning">提交</el-button>
|
||||
</el-footer>
|
||||
</el-container>
|
||||
<el-card v-else shadow="never" style="height: 100%;">
|
||||
<el-descriptions title="基本信息" :column="3" style="width: 100%">
|
||||
<el-descriptions-item label="编号">
|
||||
{{form.number}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="出入库类型">
|
||||
{{typeDict[form.type]}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">
|
||||
{{stateDict[form.state]}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="部门/车间">
|
||||
{{form.belong_dept_name}}-{{ form.mgroup_name }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="执行人">
|
||||
{{form.do_user_name}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="创建时间">
|
||||
{{form.create_time}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<div style="height: 8px"></div>
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
row-key="id"
|
||||
stripe
|
||||
hidePagination
|
||||
hideDo
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="物料"
|
||||
prop="material"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="scope"
|
||||
>{{ scope.row.material_name }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" prop="batch">
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库" prop="warehouse_name">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="组合件信息"
|
||||
v-if="cate == 'good'"
|
||||
width="300"
|
||||
>
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.assemb.length > 0">
|
||||
<div
|
||||
v-for="item in scope.row.assemb"
|
||||
:key="item.id"
|
||||
>
|
||||
<div>
|
||||
{{ item.material_name }}
|
||||
<span
|
||||
style="
|
||||
color: gray;
|
||||
font-size: 12px;
|
||||
"
|
||||
>批:</span
|
||||
>{{ item.batch }}
|
||||
<span
|
||||
style="
|
||||
color: gray;
|
||||
font-size: 12px;
|
||||
"
|
||||
>比:</span
|
||||
>{{ item.rate }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格数量" prop="count_notok">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
prop="create_time"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-card>
|
||||
<save-dialog
|
||||
v-if="dialog.save"
|
||||
ref="saveDialog"
|
||||
:cate = "cate"
|
||||
:mgroupId = 'mgroupId'
|
||||
:mioId = 'mioId'
|
||||
:process="process"
|
||||
@success="handleSaveSuccess"
|
||||
@closed="dialog.save = false"
|
||||
></save-dialog>
|
||||
|
|
@ -191,19 +280,20 @@
|
|||
<script>
|
||||
import saveDialog from "./inm_record_form.vue";
|
||||
export default {
|
||||
name: "routepack_form",
|
||||
name: "inm_record",
|
||||
components: { saveDialog },
|
||||
props: {
|
||||
cate: { type: String, default: "" },
|
||||
deptId: { type: String, default: "" },
|
||||
mgroupId: { type: String, default: "" },
|
||||
process: { type: String, default: "" },
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
active: 0,
|
||||
stepSuc: [0],
|
||||
stepes: ["基本信息", "详情"],
|
||||
titleMap: { add: "新增出入库", edit: "编辑出入库" },
|
||||
titleMap: { add: "新增出入库", edit: "编辑出入库",show:"出入库详情" },
|
||||
mode: "add",
|
||||
isSaveing: false, //控制基本信息提交
|
||||
search: {
|
||||
|
|
@ -222,6 +312,8 @@ export default {
|
|||
do_user: "",
|
||||
mio_user: "",
|
||||
},
|
||||
stateDict: {10: "创建中",20: "已提交",},
|
||||
typeDict:{'do_in':'生产入库','do_out':'生产领料'},
|
||||
apiworkerObj: null,
|
||||
materials: [],
|
||||
apiObj: null,
|
||||
|
|
@ -233,6 +325,7 @@ export default {
|
|||
},
|
||||
mioId:null,
|
||||
routepack: "",
|
||||
tableData:[],
|
||||
userOption: [],//仓库执行人
|
||||
userOptions: [],//部门执行人
|
||||
deptOptions: [],
|
||||
|
|
@ -244,10 +337,13 @@ export default {
|
|||
this.form.mgroup = this.mgroupId;
|
||||
this.form.type = this.cate;
|
||||
this.form.belong_dept = this.deptId;
|
||||
this.getDeptOptions();
|
||||
this.getmgroupOptions();
|
||||
this.getDeptUsers();//获取该部门下的员工
|
||||
this.getDeptUser();//获取仓库人员
|
||||
this.$nextTick(() => {
|
||||
this.getDeptOptions();
|
||||
this.getmgroupOptions();
|
||||
this.getDeptUsers();//获取该部门下的员工
|
||||
this.getDeptUser();//获取仓库人员
|
||||
})
|
||||
|
||||
},
|
||||
methods: {
|
||||
open(mode) {
|
||||
|
|
@ -255,9 +351,23 @@ export default {
|
|||
this.visible = true;
|
||||
return this;
|
||||
},
|
||||
setData(data) {
|
||||
setData(data,type) {
|
||||
console.log('data',data)
|
||||
this.mioId = data.id;
|
||||
if(type){
|
||||
this.getTableData();
|
||||
}
|
||||
Object.assign(this.form, data);
|
||||
},
|
||||
getTableData() {
|
||||
let that = this;
|
||||
let obj = {};
|
||||
obj.mio = that.mioId;
|
||||
obj.page = 0;
|
||||
that.$API.inm.mioitem.list.req(obj).then((res) => {
|
||||
that.tableData = res;
|
||||
});
|
||||
},
|
||||
//工段列表
|
||||
getmgroupOptions() {
|
||||
this.$API.mtm.mgroup.list.req({page: 0}).then(res=>{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
:rules="rules"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-form-item label="物料">
|
||||
<el-form-item label="物料" v-if="cate == 'do_out'">
|
||||
<el-select
|
||||
v-model="form.material"
|
||||
value-key="id"
|
||||
|
|
@ -40,6 +40,30 @@
|
|||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料批次" v-else>
|
||||
<el-select
|
||||
v-model="form.batch"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="selectwmChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in wbatchOptions"
|
||||
:key="item.id"
|
||||
:value="item.batch"
|
||||
>
|
||||
<span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span>
|
||||
<span
|
||||
style="
|
||||
float: right;
|
||||
color: var(--el-text-color-secondary);
|
||||
font-size: 13px;
|
||||
"
|
||||
>{{ item.count }}</span
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="批次" v-if="cate == 'do_out'">
|
||||
<el-select
|
||||
v-model="selectBatch"
|
||||
|
|
@ -67,32 +91,6 @@
|
|||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="批次号" v-else>
|
||||
<el-select
|
||||
v-model="form.batch"
|
||||
filterable
|
||||
allow-create
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in wbatchOptions"
|
||||
:key="item.id"
|
||||
:value="item.batch"
|
||||
>
|
||||
<span style="float: left">{{ item.batch }}</span>
|
||||
<span
|
||||
style="
|
||||
float: right;
|
||||
color: var(--el-text-color-secondary);
|
||||
font-size: 13px;
|
||||
"
|
||||
>{{ item.count }}</span
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="仓库">
|
||||
<el-select
|
||||
v-model="form.warehouse"
|
||||
|
|
@ -111,7 +109,7 @@
|
|||
<el-input-number
|
||||
v-model="form.count"
|
||||
:min="0"
|
||||
:precision="3"
|
||||
:precision="0"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -131,6 +129,7 @@ export default {
|
|||
cate: { type: String, default: "" },
|
||||
mioId: { type: String, default: "" },
|
||||
mgroupId: { type: String, default: "" },
|
||||
process: { type: String, default: "" },
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -161,12 +160,12 @@ export default {
|
|||
mounted() {
|
||||
this.form.type = this.cate ;
|
||||
this.form.mio = this.mioId ;
|
||||
this.getMaterialOptions();
|
||||
if(this.cate == 'do_out'){//领料---仓库
|
||||
this.inputBatchDisable = true;
|
||||
this.getMaterialOptions();
|
||||
this.getBatchOptions();
|
||||
}else{//入库----工段
|
||||
this.getWBatchs();
|
||||
this.getMgroupWmaterial();
|
||||
}
|
||||
this.getWarehouseOptions();
|
||||
},
|
||||
|
|
@ -196,12 +195,14 @@ export default {
|
|||
});
|
||||
},
|
||||
//获取车间物料批次号
|
||||
getWBatchs() {
|
||||
getMgroupWmaterial() {
|
||||
let that = this;
|
||||
let obj = {};
|
||||
obj.mgroupx= that.mgroupId;
|
||||
obj.material= that.form.material;
|
||||
obj.state = 10;
|
||||
obj.page= 0;
|
||||
obj.mgroupx= that.mgroupId;
|
||||
obj.material__process= that.process;
|
||||
|
||||
if (that.mgroupId != null &&that.mgroupId != undefined &&that.mgroupId != "") {
|
||||
that.$API.wpm.wmaterial.list.req(obj).then((res) => {
|
||||
that.wbatchOptions = res;
|
||||
|
|
@ -211,7 +212,6 @@ export default {
|
|||
//库存物料批次
|
||||
getBatchOptions() {
|
||||
let that = this;
|
||||
that.getWBatchs();
|
||||
let obj = {};
|
||||
obj.page = 0;
|
||||
obj.material = that.form.material;
|
||||
|
|
@ -220,12 +220,7 @@ export default {
|
|||
});
|
||||
},
|
||||
selectMaterialChange() {
|
||||
let that = this;
|
||||
if(that.cate=='do_in'){
|
||||
that.getWBatchs();
|
||||
}else{
|
||||
that.getBatchOptions();
|
||||
}
|
||||
this.getBatchOptions();
|
||||
},
|
||||
getItem(options, id) {
|
||||
for (var i = 0; i < options.length; i++) {
|
||||
|
|
@ -238,6 +233,15 @@ export default {
|
|||
this.form.batch = item.batch;
|
||||
this.form.warehouse = item.warehouse;
|
||||
},
|
||||
//选择车间库存物料后的处理
|
||||
selectwmChange(val){
|
||||
let that = this;
|
||||
that.wbatchOptions.forEach((item) => {
|
||||
if (item.batch == val) {
|
||||
that.form.material = item.material;
|
||||
}
|
||||
})
|
||||
},
|
||||
selectBatchClear() {
|
||||
this.form.batch = "";
|
||||
this.form.warehouse = "";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,322 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
|
||||
v-if="mgroupName!=='size'&&mgroupName!=='facade'"
|
||||
>领料</el-button
|
||||
>
|
||||
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'"
|
||||
>入库</el-button
|
||||
>
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
@click="add('do_out')"
|
||||
v-auth="'mio.do'"
|
||||
>生产领料</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="add('do_in')"
|
||||
v-auth="'mio.do'"
|
||||
>生产入库</el-button
|
||||
> -->
|
||||
<el-select
|
||||
v-model="query.type"
|
||||
clearable
|
||||
style="width: 120px; margin-left: 2px"
|
||||
placeholder="出入库类型"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in cateOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<el-select
|
||||
v-model="query.state"
|
||||
clearable
|
||||
style="width: 120px; margin-left: 2px"
|
||||
placeholder="状态"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in stateOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="编号"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
:params="params"
|
||||
:query="query"
|
||||
row-key="id"
|
||||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="记录编号"
|
||||
prop="number"
|
||||
></el-table-column>
|
||||
<el-table-column label="出/入库类型">
|
||||
<template #default="scope">
|
||||
{{ typeDict[scope.row.type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="记录状态">
|
||||
<template #default="scope">
|
||||
{{ stateDict[scope.row.state] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出/入库日期" prop="inout_date">
|
||||
</el-table-column>
|
||||
<el-table-column label="执行部门" prop="belong_dept_name">
|
||||
<template #default="scope">
|
||||
{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建人" prop="create_by_name">
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" prop="create_time">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
fixed="right"
|
||||
align="center"
|
||||
width="120px"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="table_detail(scope.row)"
|
||||
>
|
||||
查看
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="table_edit(scope.row)"
|
||||
v-if="scope.row.state == 10"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="table_submit(scope.row)"
|
||||
v-auth="'mio.submit'"
|
||||
v-if="scope.row.state == 10"
|
||||
>
|
||||
提交
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="table_del(scope.row)"
|
||||
v-auth="'mio.delete'"
|
||||
v-if="scope.row.state == 10"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="warning"
|
||||
@click="revert(scope.row)"
|
||||
v-auth="'mio.submit'"
|
||||
v-if="scope.row.state == 20"
|
||||
>
|
||||
撤销
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<save-dialog
|
||||
v-if="dialog.inmRecord"
|
||||
ref="inmRecordDialog"
|
||||
:cate = "cate_type"
|
||||
:process = "process"
|
||||
:mgroupId = "params.mgroup"
|
||||
:deptId = " deptId"
|
||||
@success="handleinmSuccess"
|
||||
>
|
||||
</save-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from "./inm_record.vue";
|
||||
|
||||
export default {
|
||||
name: "mio",
|
||||
components: {
|
||||
saveDialog
|
||||
},
|
||||
props: {
|
||||
mgroupName: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
stateDict: {
|
||||
10: "创建中",
|
||||
20: "已提交",
|
||||
},
|
||||
stateOptions: [
|
||||
{ id: 10, name: "创建中" },
|
||||
{ id: 20, name: "已提交" },
|
||||
],
|
||||
typeDict: {
|
||||
do_out: "生产领料",
|
||||
do_in: "生产入库",
|
||||
},
|
||||
cateOptions: [
|
||||
{ id: "do_out", name: "生产领料" },
|
||||
{ id: "do_in", name: "生产入库" },
|
||||
],
|
||||
dialog: {
|
||||
save: false,
|
||||
inmRecord: false,
|
||||
},
|
||||
query: {},
|
||||
params: {
|
||||
type__in: "do_out,do_in",
|
||||
mgroup:""
|
||||
},
|
||||
form: {},
|
||||
apiObj: null,
|
||||
selection: [],
|
||||
type: "",
|
||||
deptId:"",
|
||||
process: "",
|
||||
cate: "good",
|
||||
mioId: "",
|
||||
visibleDrawer: false,
|
||||
inmRecordDialog:false,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
that.$nextTick(() => {
|
||||
that.$API.mtm.mgroup.list.req({ page: 0, search: that.mgroupName }).then((res) => {
|
||||
if (res.length < 1) {
|
||||
that.$message.error("获取工段错误");
|
||||
return;
|
||||
}
|
||||
that.params.mgroup = res[0].id;
|
||||
that.deptId = res[0].belong_dept;
|
||||
that.process = res[0].process;
|
||||
that.apiObj = that.$API.inm.mio.list;
|
||||
});
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
tomio(type) {
|
||||
let that = this;
|
||||
that.cate_type=type;
|
||||
that.dialog.inmRecord = true;
|
||||
that.$nextTick(() => {
|
||||
that.$refs.inmRecordDialog.open("add");
|
||||
});
|
||||
},
|
||||
//添加
|
||||
add(type) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add", type);
|
||||
});
|
||||
},
|
||||
//编辑
|
||||
table_edit(row) {
|
||||
let that = this;
|
||||
that.cate_type=row.type;
|
||||
that.dialog.inmRecord = true;
|
||||
that.$nextTick(() => {
|
||||
that.$refs.inmRecordDialog.open("add").setData(row);
|
||||
});
|
||||
},
|
||||
//查看
|
||||
table_detail(row) {
|
||||
let that = this;
|
||||
that.cate_type=row.type;
|
||||
that.dialog.inmRecord = true;
|
||||
that.$nextTick(() => {
|
||||
that.$refs.inmRecordDialog.open("show").setData(row,row.type);
|
||||
});
|
||||
},
|
||||
//撤销
|
||||
revert(row) {
|
||||
this.$confirm(`确定撤销该操作吗？`, "提示", {
|
||||
type: "warning",
|
||||
}).then(() => {
|
||||
this.$API.inm.mio.revert.req(row.id).then((res) => {
|
||||
this.$message.success("撤销成功");
|
||||
this.$refs.table.refresh();
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
|
||||
//删除
|
||||
table_del(row) {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
this.$API.inm.mio.delete
|
||||
.req(row.id)
|
||||
.then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.table.refresh();
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
table_submit(row) {
|
||||
this.$API.inm.mio.submit.req(row.id).then((res) => {
|
||||
this.$message.success("提交成功");
|
||||
this.$refs.table.refresh();
|
||||
});
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
handleinmSuccess(){},
|
||||
handleSaveSuccess() {
|
||||
this.$refs.table.refresh();
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -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){
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else :mgroupName="mgroupName"></inm>
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -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: "",
|
||||
|
|
|
|||
Loading…
Reference in New Issue