This commit is contained in:
parent
88fcbe4518
commit
7ef9042a0d
|
|
@ -221,13 +221,7 @@
|
||||||
methods: {
|
methods: {
|
||||||
getDept() {
|
getDept() {
|
||||||
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
||||||
let data = [];
|
this.deptData = res;
|
||||||
res.forEach(item => {
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
data.push(item)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.deptData = data;
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
|
|
|
||||||
|
|
@ -157,14 +157,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
getDept() {
|
getDept() {
|
||||||
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
||||||
let data = [];
|
this.deptData = res;
|
||||||
res.forEach(item => {
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
data.push(item)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
console.log(data)
|
|
||||||
this.deptData = data;
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//添加
|
//添加
|
||||||
|
|
|
||||||
|
|
@ -82,13 +82,7 @@
|
||||||
methods: {
|
methods: {
|
||||||
getDept() {
|
getDept() {
|
||||||
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
||||||
let data = [];
|
this.deptData = res;
|
||||||
res.forEach(item => {
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
data.push(item)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.deptData = data;
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
getTableData(){
|
getTableData(){
|
||||||
|
|
|
||||||
|
|
@ -371,7 +371,8 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
<el-form-item label="总袋(桶)数:">
|
<el-form-item label="总袋(桶)数:">
|
||||||
{{ objitem.count }}
|
<el-input-number v-model="form.count_bag" :min="0" style="width:100%" controls-position="right">
|
||||||
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
|
|
@ -379,55 +380,6 @@
|
||||||
<el-input v-model="form.weight_kgs_count" disabled placeholder="抽样数量"/>
|
<el-input v-model="form.weight_kgs_count" disabled placeholder="抽样数量"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col>
|
|
||||||
<el-form-item label="称重记录/Kg">
|
|
||||||
<el-button type="primary" icon="el-icon-plus" @click="addWeight"></el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :md="12" :sm="24" v-for="(item,ind) in weight_kgs" :key="item" style="position:relative">
|
|
||||||
<el-form-item :label-width="50">
|
|
||||||
<el-input-number v-model="item.value" :min="0" style="width:90%" controls-position="right" @change="countSun"/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-button @click="delWeight(ind)" type="danger" icon="el-icon-delete" circle style="position:absolute;right:-10px;top:0"/>
|
|
||||||
</el-col>
|
|
||||||
<el-col :md="12" :sm="24">
|
|
||||||
<el-form-item label="抽样计算总重量/Kg">
|
|
||||||
<el-input-number v-model="form.count_bag_weight_all" :min="0" style="width:100%" controls-position="right">
|
|
||||||
</el-input-number>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<!-- <el-col :md="12" :sm="24">
|
|
||||||
<el-form-item label="合同采购量/Kg">
|
|
||||||
<el-input-number v-model="form.count" :min="0" style="width:100%" controls-position="right">
|
|
||||||
</el-input-number>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col> -->
|
|
||||||
<el-col :md="12" :sm="24">
|
|
||||||
<el-form-item label="检验合格" prop="is_testok">
|
|
||||||
<el-select
|
|
||||||
v-model="form.is_testok"
|
|
||||||
placeholder="检验合格"
|
|
||||||
clearable
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option label="是" :value="true"/>
|
|
||||||
<el-option label="否" :value="false"/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<!-- <el-col :md="12" :sm="24" prop="is_testok">
|
|
||||||
<el-form-item label="结论判定" prop="is_testok">
|
|
||||||
<el-select
|
|
||||||
v-model="form.is_testok"
|
|
||||||
placeholder="结论判定"
|
|
||||||
clearable
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option label="是" value="true"/>
|
|
||||||
<el-option label="否" value="false"/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col> -->
|
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
<el-form-item label="检验日期" prop="test_date">
|
<el-form-item label="检验日期" prop="test_date">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -444,6 +396,7 @@
|
||||||
v-model="form.test_user"
|
v-model="form.test_user"
|
||||||
placeholder="检验员"
|
placeholder="检验员"
|
||||||
clearable
|
clearable
|
||||||
|
filterable
|
||||||
style="width:100%"
|
style="width:100%"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
|
|
@ -455,6 +408,56 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :md="12" :sm="24">
|
||||||
|
<el-form-item label="检验合格" prop="is_testok">
|
||||||
|
<el-select
|
||||||
|
v-model="form.is_testok"
|
||||||
|
placeholder="检验合格"
|
||||||
|
clearable
|
||||||
|
style="width:100%"
|
||||||
|
>
|
||||||
|
<el-option label="是" :value="true"/>
|
||||||
|
<el-option label="否" :value="false"/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :md="12" :sm="24">
|
||||||
|
<el-form-item label="抽样计算总重量/Kg">
|
||||||
|
<el-input-number v-model="form.count_bag_weight_all" :min="0" style="width:100%" controls-position="right">
|
||||||
|
</el-input-number>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col>
|
||||||
|
<el-form-item label="称重记录/Kg">
|
||||||
|
<el-button type="primary" icon="el-icon-plus" @click="addWeight"></el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :md="12" :sm="24" v-for="(item,ind) in weight_kgs" :key="item" style="position:relative">
|
||||||
|
<el-form-item :label-width="50">
|
||||||
|
<el-input-number v-model="item.value" :min="0" style="width:90%" controls-position="right" @change="countSun"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-button @click="delWeight(ind)" type="danger" icon="el-icon-delete" circle style="position:absolute;right:-10px;top:0"/>
|
||||||
|
</el-col>
|
||||||
|
<!-- <el-col :md="12" :sm="24">
|
||||||
|
<el-form-item label="合同采购量/Kg">
|
||||||
|
<el-input-number v-model="form.count" :min="0" style="width:100%" controls-position="right">
|
||||||
|
</el-input-number>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<!-- <el-col :md="12" :sm="24" prop="is_testok">
|
||||||
|
<el-form-item label="结论判定" prop="is_testok">
|
||||||
|
<el-select
|
||||||
|
v-model="form.is_testok"
|
||||||
|
placeholder="结论判定"
|
||||||
|
clearable
|
||||||
|
style="width:100%"
|
||||||
|
>
|
||||||
|
<el-option label="是" value="true"/>
|
||||||
|
<el-option label="否" value="false"/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-main>
|
</el-main>
|
||||||
|
|
@ -510,9 +513,10 @@ export default {
|
||||||
this.getUserList();
|
this.getUserList();
|
||||||
let that = this;
|
let that = this;
|
||||||
if(that.type=='pur_in'){
|
if(that.type=='pur_in'){
|
||||||
|
console.log('objitem',that.objitem)
|
||||||
that.form.material_name = that.objitem.material_name;
|
that.form.material_name = that.objitem.material_name;
|
||||||
that.form.batch = that.objitem.batch;
|
that.form.batch = that.objitem.batch;
|
||||||
that.form.count_bag = that.objitem.count;
|
that.form.count_bag = that.objitem.count_bag;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
@ -544,7 +548,7 @@ export default {
|
||||||
that.weight_kgs.forEach(item=>{
|
that.weight_kgs.forEach(item=>{
|
||||||
sum = sum+item.value;
|
sum = sum+item.value;
|
||||||
})
|
})
|
||||||
that.form.count_bag_weight_all = sum/that.weight_kgs.length*that.objitem.count;
|
that.form.count_bag_weight_all = sum/that.weight_kgs.length*that.form.count_bag;
|
||||||
},
|
},
|
||||||
countChange(){
|
countChange(){
|
||||||
|
|
||||||
|
|
@ -565,7 +569,7 @@ export default {
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.test_date = that.form.test_date;
|
obj.test_date = that.form.test_date;
|
||||||
obj.test_user = that.form.test_user;
|
obj.test_user = that.form.test_user;
|
||||||
obj.count_bag = that.objitem.count;
|
obj.count_bag = that.objitem.count_bag;
|
||||||
obj.weight_kgs = arr;
|
obj.weight_kgs = arr;
|
||||||
obj.is_testok = that.form.is_testok;
|
obj.is_testok = that.form.is_testok;
|
||||||
console.log(obj)
|
console.log(obj)
|
||||||
|
|
@ -598,6 +602,7 @@ export default {
|
||||||
Object.assign(that.form, data);
|
Object.assign(that.form, data);
|
||||||
// that.form.test_group = that.form.split(',');
|
// that.form.test_group = that.form.split(',');
|
||||||
that.weight_kgs = [];
|
that.weight_kgs = [];
|
||||||
|
console.log(data.count_bag)
|
||||||
console.log(data.weight_kgs)
|
console.log(data.weight_kgs)
|
||||||
if(data.weight_kgs.length>0){
|
if(data.weight_kgs.length>0){
|
||||||
that.form.weight_kgs_count = data.weight_kgs.length;
|
that.form.weight_kgs_count = data.weight_kgs.length;
|
||||||
|
|
@ -608,7 +613,7 @@ export default {
|
||||||
obj.value = item;
|
obj.value = item;
|
||||||
that.weight_kgs.push(obj)
|
that.weight_kgs.push(obj)
|
||||||
})
|
})
|
||||||
that.form.count_bag_weight_all =sum/data.weight_kgs.length*data.count;
|
that.form.count_bag_weight_all =sum/data.weight_kgs.length*data.count_bag;
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -98,16 +98,8 @@
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getDepts(){
|
getDepts(){
|
||||||
this.$API.system.dept.list.req({page:0}).then(res=>{
|
this.$API.system.dept.list.req({page:0,type:'dept'}).then(res=>{
|
||||||
debugger;
|
this.deptOptions = res;
|
||||||
console.log(res)
|
|
||||||
let data = [];
|
|
||||||
res.forEach(item => {
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
data.push(item)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.deptOptions = data;
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//显示
|
//显示
|
||||||
|
|
|
||||||
|
|
@ -250,12 +250,7 @@ export default {
|
||||||
//获取部门列表
|
//获取部门列表
|
||||||
getDeptOptions() {
|
getDeptOptions() {
|
||||||
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
||||||
this.deptOptions = [];
|
this.deptOptions = res;
|
||||||
res.forEach(item=>{
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
this.deptOptions.push(item)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取员工
|
//获取员工
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.test_user"
|
v-model="form.test_user"
|
||||||
placeholder="操作人"
|
placeholder="操作人"
|
||||||
clearable
|
clearable filterable
|
||||||
style="width:100%"
|
style="width:100%"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.check_user"
|
v-model="form.check_user"
|
||||||
placeholder="专检人"
|
placeholder="专检人"
|
||||||
clearable
|
clearable filterable
|
||||||
style="width:100%"
|
style="width:100%"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
|
|
@ -210,12 +210,7 @@ export default {
|
||||||
//获取部门列表
|
//获取部门列表
|
||||||
getDeptOptions() {
|
getDeptOptions() {
|
||||||
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
||||||
this.deptOptions = [];
|
this.deptOptions = res;
|
||||||
res.forEach(item=>{
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
this.deptOptions.push(item)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取员工
|
//获取员工
|
||||||
|
|
@ -228,7 +223,13 @@ export default {
|
||||||
getProcess(){
|
getProcess(){
|
||||||
let that = this;
|
let that = this;
|
||||||
this.$API.mtm.process.list.req({page:0}).then(res=>{
|
this.$API.mtm.process.list.req({page:0}).then(res=>{
|
||||||
that.processOptions = res;
|
let arr = [];
|
||||||
|
res.forEach(item => {
|
||||||
|
if(item.name.indexOf('磨')>-1){
|
||||||
|
arr.push(item);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
that.processOptions = arr;
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
//提交
|
//提交
|
||||||
|
|
|
||||||
|
|
@ -184,12 +184,7 @@ export default {
|
||||||
//获取部门列表
|
//获取部门列表
|
||||||
getDeptOptions() {
|
getDeptOptions() {
|
||||||
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
||||||
this.deptOptions = [];
|
this.deptOptions = res;
|
||||||
res.forEach(item=>{
|
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
this.deptOptions.push(item)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取员工
|
//获取员工
|
||||||
|
|
|
||||||
|
|
@ -119,14 +119,8 @@
|
||||||
methods:{
|
methods:{
|
||||||
getDept() {
|
getDept() {
|
||||||
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
||||||
let data = [];
|
this.deptData = res;
|
||||||
res.forEach(item => {
|
this.queryBelongDept = res[0].name;
|
||||||
if(item.parent=='3423856735881117696'){
|
|
||||||
data.push(item)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.deptData = data;
|
|
||||||
this.queryBelongDept = data[0].name;
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
queryTypeChange(value){
|
queryTypeChange(value){
|
||||||
|
|
|
||||||
|
|
@ -123,12 +123,7 @@ export default {
|
||||||
//获取部门列表
|
//获取部门列表
|
||||||
getDeptOptions() {
|
getDeptOptions() {
|
||||||
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
|
||||||
this.deptOptions = [];
|
this.deptOptions = res;
|
||||||
res.forEach(item => {
|
|
||||||
if (item.parent == '3423856735881117696') {
|
|
||||||
this.deptOptions.push(item)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取车间物料
|
//获取车间物料
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue