fix:日志改动
This commit is contained in:
parent
4b02b7c00f
commit
2dfc51b67d
|
|
@ -94,6 +94,13 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="领用数量" prop="count_use">
|
||||
</el-table-column>
|
||||
<el-table-column label="主要批次" prop="is_main_batchin">
|
||||
<template #default="scope">
|
||||
<el-tag :type="scope.row.parent==null ? 'success': 'info'">
|
||||
{{scope.row.is_main_batchin==null ? '是' : '否'}}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="加工前不良" prop="count_pn_jgqbl">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -268,6 +275,7 @@
|
|||
ref="saveDialog"
|
||||
:mlog="mlogId"
|
||||
:mgroup="mgroup"
|
||||
:routeId ="routeId"
|
||||
:tracking="tracking"
|
||||
:materialIn="materialIn"
|
||||
@success="handleSaveSuccess"
|
||||
|
|
@ -287,6 +295,7 @@
|
|||
ref="checkDialogSingle"
|
||||
:mlogb="mlogb"
|
||||
:wm = "wm"
|
||||
:qct="qct"
|
||||
@success="handlesCheckSuccess"
|
||||
@closed="dialog.check_single = false"
|
||||
>
|
||||
|
|
@ -349,6 +358,7 @@ export default {
|
|||
paramsIn: {
|
||||
page: 0,
|
||||
mlog: "",
|
||||
with_children:'yes',
|
||||
material_in__isnull: 0,
|
||||
},
|
||||
paramsOut: {
|
||||
|
|
@ -412,7 +422,8 @@ export default {
|
|||
that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
|
||||
that.mlogItem = res;
|
||||
console.log('that.mlogItem',that.mlogItem);
|
||||
this.tracking = this.mlogItem.material_in_.tracking;
|
||||
that.routeId = res.route;
|
||||
that.tracking = res.material_in_.tracking;
|
||||
if(res.test_file!==null){
|
||||
that.fileList = [{name:res.test_file,url:res.test_file}];
|
||||
that.form.test_file = res.test_file;
|
||||
|
|
@ -510,6 +521,7 @@ export default {
|
|||
this.dialog.check_single = true;
|
||||
this.mlogb = row.id;
|
||||
this.wm = row.wm_in;
|
||||
this.qct = row.qct;
|
||||
let obj = {};
|
||||
Object.assign(obj, row);
|
||||
obj.mgroup_name = this.mlogItem.mgroup_name;
|
||||
|
|
|
|||
|
|
@ -39,6 +39,22 @@
|
|||
<el-form-item label="使用数量" prop="count_use">
|
||||
<el-input-number ref="codeInput" v-model="form.count_use" clearable></el-input-number>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要批次">
|
||||
<el-select
|
||||
v-model="form.parent"
|
||||
placeholder="主要批次"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in mlogbInOptions"
|
||||
:key="item.id"
|
||||
:label="item.batch"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-footer v-if="tracking == 10">
|
||||
<el-button type="primary" :loading="isSaveing" @click="submit">提交</el-button>
|
||||
|
|
@ -56,7 +72,8 @@ const defaultForm = {
|
|||
batch: "",
|
||||
wm_in: "",
|
||||
count_use: 1,
|
||||
note:''
|
||||
note:'',
|
||||
parent: "",
|
||||
};
|
||||
export default {
|
||||
props: {
|
||||
|
|
@ -72,6 +89,10 @@ export default {
|
|||
type: Number,
|
||||
default: 10,
|
||||
},
|
||||
routeId:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
materialIn: {
|
||||
type: String,
|
||||
default: "",
|
||||
|
|
@ -100,24 +121,42 @@ export default {
|
|||
},
|
||||
wm_in:'',
|
||||
options: [],
|
||||
mlogbInOptions:[],
|
||||
materialOptions: [],
|
||||
mgroup_code:'',
|
||||
visible: false,
|
||||
isSaveing: false,
|
||||
setFiltersVisible: false,
|
||||
params: {
|
||||
page: 0,
|
||||
mlog: "",
|
||||
material_in__isnull: 0,
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.form.mlog = this.mlog;
|
||||
this.params.mlog = this.mlog;
|
||||
let arr = this.$route.path.split("/");
|
||||
this.mgroup_code = arr[2];
|
||||
this.getMtask();
|
||||
this.getMaterial();
|
||||
this.getParentList();
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
this.visible = true;
|
||||
},
|
||||
getParentList(){
|
||||
let that = this;
|
||||
that.$API.wpm.mlogb.list.req(that.params).then((res) => {
|
||||
if(res.length>0){
|
||||
that.mlogbInOptions = res.filter((item)=>{
|
||||
return item.parent==null;
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
//获取任务列表
|
||||
getMtask() {
|
||||
let that = this;
|
||||
|
|
@ -131,7 +170,7 @@ export default {
|
|||
this.$API.wpm.wmaterial.list.req({
|
||||
mtaskx: that.form.mtask,
|
||||
mgroupx: that.mgroup,
|
||||
material: that.materialIn,
|
||||
route: that.routeId,
|
||||
page: 0,
|
||||
}).then((res) => {
|
||||
that.materialOptions = res;
|
||||
|
|
@ -163,6 +202,9 @@ export default {
|
|||
that.$message.success("添加成功");
|
||||
that.$emit("success");
|
||||
that.wm_in = '';
|
||||
that.mtask = '';
|
||||
that.batch = '';
|
||||
that.parent = '';
|
||||
}).catch((err) => {});
|
||||
},
|
||||
//设置过滤项
|
||||
|
|
|
|||
Loading…
Reference in New Issue