功能升级2

yangwl
zhaoxiaolin
parent 79608c5eb3
commit 34f4c99a40

@ -108,4 +108,13 @@ export function subChangeWorkOrderM(data){
method:'post',
data:data
})
}
}
// 查询生产工单详细
export function getBPNBomList(query) {
return request({
url: '/plan/bppro/workorder/getBPNBomList',
method: 'get',
params: query
});
}

@ -42,3 +42,12 @@ export function delCpkUpdown(id) {
method: 'delete'
});
}
// 查询物料检验标准列表
export function listMaterialCheckStandar(query) {
return request({
url: '/quality/cpkUpdown/getMaterialCheckStandarList',
method: 'get',
params: query
});
}

@ -891,7 +891,7 @@ export default {
factory: _this.selectxt,
shiftId: _this.selectxtclasses,
ymd: _this.datetime,
equTypeCode: "equ_type_spj",
equTypeCode: "equ_type_hf",
}).then((response) => {
if (response) {
if (response.data) {

@ -0,0 +1,179 @@
<template>
<div>
<el-dialog title="白坯BOM组成"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="700px"
>
<el-table v-loading="loading" :data="itemList" ref="myTable">
<el-table-column width="50" align="center" type="selection">
</el-table-column>
<!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
<el-table-column label="物料编码" align="left" prop="productCode" width="230" />
<el-table-column label="物料名称" align="left" prop="productName" width="290" :show-overflow-tooltip="true"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelForm" > </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getBPNBomList} from "@/api/plan/bpworkorder";
import { getDictData,} from "@/api/system/dict/data";
export default {
name: "itemSelectUser",
dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
data() {
return {
viewStatus : '0',
showFlag: false,
dyloading: false,
//
selectedRows: {},
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// BOM
itemList: null,
qcCheckTaskDetails: [],
remarkList: [],
//
bomCode: undefined,
defaultProps: {
id: "id",
label: "label"
},
//
queryParams: {
pageNum: 1,
pageSize: 10,
belongTo:''
//,userCode: '',
//userName : ''
},
data:{},
form:{
checkResult: 'Y',
startOA: '0',
},
dynamicValidateForm: {
domains: [{
value: ''
}],
sampleAql:null,
checkLevel:null
},
//
valueOpen: false,
//id
recordId:'',
weight: null,
//belongTo
belongTo:'',
//
typeCode:'',
//
defectOpen: false,
updateFlag: false,
//
defectList:[],
defectForm: {
defectItems: [
{defectSubclass: '',
defectCode: '',
noOkQuality: 0,
belongToDetail: '',
belongTo: ''
}
]
},
rules: {
},
aqlNoOkVal:0,
sampleCode: null,
checkLevel:null
};
},
created() {
},
methods: {
init(workorderId){
this.queryParams.workorderId = workorderId;
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
this.getList();
},
/** 查询表格列表*/
getList() {
this.loading = true;
getBPNBomList(this.queryParams).then(response => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
reset() {
this.form = {
checkResult: null,
startOA: null,
materialType: null,
materialFrom: null,
remarkCode: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
projectType: null,
};
this.resetForm("form");
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
cancelForm() {
this.showFlag = false;
this.reset();
},
//
indexMethod(index) {
return index + 1;
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>

@ -174,6 +174,24 @@
v-hasPermi="['mes:bppro:workorder:edit']"
>湿料计划删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-guide" size="mini"
@click="handleAutoSplit"
:disabled="single">辅助排产
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-s-order" size="mini"
@click="handleBom"
:disabled="single">物料BOM
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-guide" size="mini"
@click="handleSAPSync"
:disabled="single">SAP同步
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -630,6 +648,9 @@
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!--检验项目弹窗-->
<ItemBoms ref="itemSelectProject"></ItemBoms>
</div>
</template>
@ -649,9 +670,10 @@ import moment from 'moment';
import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
import {prototype} from "clipboard";
import {getHourProductionList} from '@/api/plan/whiteOrder';
import ItemBoms from "./bpBome.vue";
export default {
name: "WorkorderBP",
components: { ItemBoms},
dicts: ['product_type', 'workorder_type'],
data() {
return {
@ -661,6 +683,7 @@ export default {
checkType: false,
// 线code
proLineCode: null,
titleM: '',
//
formRef: 'form',
validateRules: [],
@ -1782,6 +1805,19 @@ export default {
}).catch(() => {
});
},
//
handleAutoSplit(){
this.$modal.msgSuccess("功能建设中敬请期待");
},
handleSAPSync(){
this.$modal.msgSuccess("功能建设中敬请期待");
},
//bom
handleBom(row){
const workorderIds = row.workorderId || this.ids;
this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(workorderIds[0]);
},
}
};
</script>

@ -0,0 +1,195 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px">
<el-form-item label="物料编号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验物料组名称" prop="groupName" label-width="120px">
<el-input
v-model="queryParams.groupName"
placeholder="请输入物料组名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验标准" prop="standNo">
<el-input
v-model="queryParams.standNo"
placeholder="请输入检验标准"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="updownList" @selection-change="handleSelectionChange">
<!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
<el-table-column label="物料编码" width="150" align="center" prop="materialCode" :formatter="productCodeFormate"/>
<el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="检验标准" width="140" align="center" prop="standNo"/>
<el-table-column label="检验物料组名称" width="140" align="center" prop="groupName"/>
<el-table-column label="物料组编码" width="140" align="center" prop="productGroup"/>
<el-table-column label="物料组名称" width="120" align="center" prop="productGroupName"/>
<el-table-column label="工厂编码" width="120" align="center" prop="siteCode"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {listMaterialCheckStandar } from "@/api/quality/cpkUpdown";
export default {
name: "MaterailCheckStandar",
dicts: ["check_type","qms_category"],
components: {},
data() {
return {
//
loading: true,
//
ids: [],
checkTypeList: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// CPK
updownList: [],
projectNoOptions: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
typeCode: null,
checkType: null,
factoryCode: null,
materialCode: null,
materialName: null,
upVal: null,
downVal: null
},
//
form: {downVal:0,upVal:0},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询物料检验标准列表 */
getList() {
this.loading = true;
listMaterialCheckStandar(this.queryParams).then(response => {
this.updownList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
typeCode: null,
checkType: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
delFlag: null,
materialCode: null,
materialName: null,
upVal: null,
downVal: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/cpkUpdown/getMaterialCheckStandarExport', {
...this.queryParams
}, `materialCheckStandar_${new Date().getTime()}.xlsx`)
},
//
indexMethod(index) {
return index + 1;
},
//
productCodeFormate(row, column, cellValue) {
if (cellValue != null) {
return cellValue.slice(7, 18); //
}
}
}
};
</script>

@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div class="app-container" >
<el-form
:model="queryParams"
ref="queryForm"
@ -35,6 +35,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SAP设备名称/编码" prop="sapName" label-width="150px">
<el-input
v-model="queryParams.sapName"
placeholder="请输入SAP设备名称/编码"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备类型" prop="equipmentTypeCode">
<el-select
v-model="queryParams.equipmentTypeCode"

Loading…
Cancel
Save