Compare commits

...

10 Commits

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 榄菊管理系统 VUE_APP_TITLE = 榄菊生产管理系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 榄菊管理系统 VUE_APP_TITLE = 榄菊生产管理系统
NODE_ENV = production NODE_ENV = production

@ -6,7 +6,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"dev": "vue-cli-service serve", "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
@ -46,14 +46,12 @@
"highlight.js": "9.18.5", "highlight.js": "9.18.5",
"js-beautify": "1.13.0", "js-beautify": "1.13.0",
"js-cookie": "3.0.1", "js-cookie": "3.0.1",
"jsbarcode": "^3.11.6",
"jsencrypt": "3.0.0-rc.1", "jsencrypt": "3.0.0-rc.1",
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcode": "^1.5.4",
"quill": "1.3.7", "quill": "1.3.7",
"screenfull": "5.0.2", "screenfull": "5.0.2",
"sortablejs": "1.10.2", "sortablejs": "1.10.2",
@ -64,7 +62,6 @@
"vue-cropper": "0.5.5", "vue-cropper": "0.5.5",
"vue-meta": "2.4.0", "vue-meta": "2.4.0",
"vue-router": "3.4.9", "vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
"vuedraggable": "2.24.3", "vuedraggable": "2.24.3",
"vuex": "3.6.0", "vuex": "3.6.0",
"xlsx": "^0.17.0" "xlsx": "^0.17.0"

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验节点维护列表
export function listCpkUpdown(query) {
return request({
url: '/quality/cpkUpdown/list',
method: 'get',
params: query
});
}
// 查询检验节点维护详细
export function getCpkUpdown(id) {
return request({
url: '/quality/cpkUpdown/' + id,
method: 'get'
});
}
// 新增检验节点维护
export function addCpkUpdown(data) {
return request({
url: '/quality/cpkUpdown',
method: 'post',
data: data
});
}
// 修改检验节点维护
export function updateCpkUpdown(data) {
return request({
url: '/quality/cpkUpdown',
method: 'put',
data: data
});
}
// 删除检验节点维护
export function delCpkUpdown(id) {
return request({
url: '/quality/cpkUpdown/' + id,
method: 'delete'
});
}

@ -167,4 +167,4 @@ export function getIncomeChartList(query) {
method: 'post', method: 'post',
data: query data: query
}); });
} }

@ -35,8 +35,8 @@ export default {
}, },
data() { data() {
return { return {
title: '管理系统', title: '榄菊生产管理系统',
logo: logoImg // logo: logoImg
} }
} }
} }

@ -480,6 +480,7 @@
<el-input-number <el-input-number
v-model="form.itemLoop" v-model="form.itemLoop"
label="" label=""
@change="changeVal"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -823,6 +824,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
//
changeVal() {
this.$forceUpdate();//
},
// List-穿 // List-穿
setTransfer() { setTransfer() {
getEquipmentList().then((response) => { getEquipmentList().then((response) => {

@ -390,6 +390,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--
<el-form-item label="申领人" prop="applyPeople"> <el-form-item label="申领人" prop="applyPeople">
<el-input <el-input
v-model="form.applyPeople" v-model="form.applyPeople"
@ -408,6 +409,7 @@
> >
</ItemSelectPerson> </ItemSelectPerson>
</el-form-item> </el-form-item>
-->
<!-- <el-form-item label="批准人" prop="applyApprovePeople"> <!-- <el-form-item label="批准人" prop="applyApprovePeople">
<el-input v-model="form.applyApprovePeople" placeholder="请选择批准人" style="width: 280px"/> <el-input v-model="form.applyApprovePeople" placeholder="请选择批准人" style="width: 280px"/>
</el-form-item> --> </el-form-item> -->
@ -528,9 +530,6 @@ export default {
applyTime: [ applyTime: [
{ required: true, message: "领用时间不能为空", trigger: "blur" }, { required: true, message: "领用时间不能为空", trigger: "blur" },
], ],
applyPeople: [
{ required: true, message: "申领人不能为空", trigger: "blur" },
],
}, },
}; };
}, },

@ -25,7 +25,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>

@ -76,7 +76,6 @@ export default {
width: calc(~"100% + 10px"); width: calc(~"100% + 10px");
height: 100%; height: 100%;
margin: 0 -5px; margin: 0 -5px;
.border-box-content { .border-box-content {
padding: 20px; padding: 20px;

@ -161,7 +161,7 @@ export default {
justify-content: end; justify-content: end;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("../assets/images/login-background.jpg"); background-image: url("../assets/images/login-background-none.jpg");
background-size: cover; background-size: cover;
} }
.title { .title {

@ -85,13 +85,13 @@
> >
<el-table-column prop="factoryCode" label="工厂" width="90"/> <el-table-column prop="factoryCode" label="工厂" width="90"/>
<el-table-column prop="workshopCode" label="车间编码" width="90"/> <el-table-column prop="workshopCode" label="车间编码" width="90"/>
<el-table-column prop="workshopName" label="车间名称" width="90"/> <!--<el-table-column prop="workshopName" label="车间名称" width="90"/>-->
<el-table-column prop="productDate" label="日期" width="100"/> <el-table-column prop="productDate" label="日期" width="100"/>
<el-table-column prop="sapCode" label="产线编码" width="90"/> <el-table-column prop="sapCode" label="产线编码" width="90"/>
<el-table-column prop="sapName" label="产线名称" width="160"/> <!--<el-table-column prop="sapName" label="产线名称" width="160"/>-->
<el-table-column prop="equipmentName" label="组别" width="90"/> <el-table-column prop="equipmentName" label="组别" width="90"/>
<el-table-column prop="prodType" label="品类" width="80"/> <el-table-column prop="prodType" label="品类" width="80"/>
<el-table-column prop="teamLeaderName" label="组长" width="100"/> <el-table-column prop="teamLeaderName" label="组长" width="100" :formatter="teamLeaderFormate"/>
<el-table-column prop="workorderCode" label="工单号" width="150"/> <el-table-column prop="workorderCode" label="工单号" width="150"/>
<el-table-column prop="productCode" label="产品编码" width="120" :formatter="productCodeFormate"/> <el-table-column prop="productCode" label="产品编码" width="120" :formatter="productCodeFormate"/>
<el-table-column prop="productName" label="产品名称" width="200"/> <el-table-column prop="productName" label="产品名称" width="200"/>
@ -251,6 +251,11 @@ export default {
return cellValue.slice(7,18); // return cellValue.slice(7,18); //
} }
}, },
teamLeaderFormate(row, column, cellValue){
if(cellValue != null){
return cellValue.split("-")[0]; //
}
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;

@ -27,8 +27,7 @@
<el-form-item label="产品编码" prop="productCode"> <el-form-item label="产品编码" prop="productCode">
<el-input <el-input
v-model="queryParams.productCode" v-model="queryParams.productCode"
type="number" placeholder="请输入产品编码"
placeholder="请输入标准用人"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -36,8 +35,7 @@
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="productName">
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
type="number" placeholder="请输入产品名称"
placeholder="请输入标准效率"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -305,8 +303,8 @@ export default {
open: false, open: false,
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: null,
pageSize: 10, pageSize: null,
lineCode: null, lineCode: null,
lineName: null, lineName: null,
useMan: null, useMan: null,

@ -13,7 +13,19 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </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"
v-hasPermi="['mes:scrap:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-tabs type="border-card" @tab-click="handleTabClick"> <el-tabs type="border-card" @tab-click="handleTabClick">
<el-tab-pane label="当月产线产量汇总" > <el-tab-pane label="当月产线产量汇总" >
<el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary> <el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
@ -326,6 +338,12 @@ export default {
handleQuery() { handleQuery() {
this.getList(); this.getList();
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/reportWork/getmonthProductionSut/export', {
...this.queryParams
}, `汇总报表_${new Date().getTime()}.xlsx`)
} }
} }
}; };

@ -272,7 +272,7 @@
<el-table-column prop="routeCode" width="75" label="实发"></el-table-column> <el-table-column prop="routeCode" width="75" label="实发"></el-table-column>
<el-table-column prop="routeCode" width="75" label="数量2"></el-table-column> <el-table-column prop="routeCode" width="75" label="数量2"></el-table-column>
</el-table> </el-table>
<!-- 底部 --> <!-- 底部 -->
<el-row class="my-print-foot0"> <el-row class="my-print-foot0">
@ -508,7 +508,7 @@ export default {
// this.printData.workTable // this.printData.workTable
for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
// 使slicei1010 // 使slicei1010
let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
// chunkedArray // chunkedArray
@ -656,16 +656,16 @@ export default {
</script> </script>
<style> <style>
.my-print-table .el-table { .my-print-table .el-table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
} }
.my-print-table .el-table__header-wrapper th { .my-print-table .el-table__header-wrapper th {
border: 1px solid black !important; border: 1px solid black !important;
} }
.my-print-table .el-table__body-wrapper td { .my-print-table .el-table__body-wrapper td {
border: 1px solid black !important; border: 1px solid black !important;
} }
.my-print-head { .my-print-head {
@ -686,16 +686,17 @@ export default {
} }
.my-print-foot { .my-print-foot {
margin-top: 10px; margin-top: 20px;
}
.my-print-foot0 {
margin-top: -1px;
padding-top:2px;
border-top: 1px solid black;
width: 94%;
} }
@media print { @media print {
body {
font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
font-size: 14px; /* 设置字体大小 */
}
.my-print-table .el-table {
border-collapse: collapse; /* 合并表格边框 */
}
} }
.fy{ .fy{

@ -0,0 +1,34 @@
<template>
<div>
<!-- <u-action-sheet :actions="list" :title="title" :show="show"></u-action-sheet>-->
<!-- <u-button @click="show = true">打开ActionSheet</u-button>-->
<el-button>默认按钮</el-button>
</div>
</template>
<script>
export default {
data() {
return {
title:'标题',
list: [
{
name:'选项一',
subname:"选项一描述",
color:'#ffaa7f',
fontSize:'20'
},
{
name: '选项二禁用',
disabled:true
},
{
name: '开启load加载', //
loading:true
}
],
show: false
};
}
};
</script>

@ -0,0 +1,442 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="检验类型" prop="typeCode">
<el-select
v-model="queryParams.typeCode"
clearable
placeholder="请选择检验类型"
@change="getCheckTypeList"
>
<el-option
v-for="dict in dict.type.check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检验节点" prop="checkType">
<el-select
v-model="queryParams.checkType"
clearable
placeholder="检验节点"
>
<el-option
v-for="dict in checkTypeList"
:key="dict.checkType"
:label="dict.checkName"
:value="dict.checkType"
></el-option>
</el-select>
</el-form-item>
<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="ruleName">
<el-input
v-model="queryParams.ruleName"
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="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['quality:cpkUpDowConfig:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['quality:cpkUpDowConfig:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['quality:cpkUpDowConfig:remove']"
>删除
</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['mes:mesLine:export']"
>导入
</el-button>
</el-col>
<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="selection" width="55" align="center"/>
<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="typeCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_type" :value="scope.row.typeCode"/>
</template>
</el-table-column>
<el-table-column label="检验节点" width="140" align="center" prop="checkType"/>
<el-table-column label="检测项编码" width="140" align="center" prop="ruleCode"/>
<el-table-column label="检测项名称" width="140" align="center" prop="ruleName"/>
<el-table-column label="上限" width="120" align="center" prop="upVal"/>
<el-table-column label="下限" width="120" align="center" prop="downVal"/>
<el-table-column label="创建时间" width="150" align="center" prop="createTime"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改物料CPK上下限维护对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="检验类型" prop="typeCode">
<el-select
v-model="form.typeCode"
clearable
style="width:100%"
placeholder="请选择检验类型"
@change="getCheckTypeList"
>
<el-option
v-for="dict in dict.type.check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检验类型" prop="checkType">
<el-select
v-model="form.checkType"
clearable
style="width:100%"
placeholder="检验节点"
@change="getProjectListFunc"
>
<el-option
v-for="dict in checkTypeList"
:key="dict.checkType"
:label="dict.checkName"
:value="dict.checkType"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料号">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="选择检测项" prop="ruleCode">
<el-select
v-model="form.ruleCode"
clearable
style="width:100%"
placeholder="检验节点"
filterable
@change="getProjectNameFunc"
>
<el-option
v-for="item in projectNoOptions"
:key="item.recordId"
:label="item.ruleName"
:value="item.recordId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测项名称" prop="ruleName" >
<el-input v-model="form.ruleName" placeholder="请输入物料名称" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上限" prop="upVal">
<el-input v-model="form.upVal" type="number" placeholder="请输入上限" min="0"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下限" prop="downVal">
<el-input v-model="form.downVal" type="number" placeholder="请输入下限" min="0"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<ItemSelectMaterial
ref="itemSelectMaterial"
@onSelected="onSelectMaterial"
></ItemSelectMaterial>
</div>
</template>
<script>
import {listCpkUpdown,getCpkUpdown, delCpkUpdown,addCpkUpdown,updateCpkUpdown } from "@/api/quality/cpkUpdown";
import ItemSelectMaterial from "@/views/quality/cpkUpDowConfig/selectMaterial";
import {getCheckTypeList,getProjectOptionList} from "@/api/quality/qcTable";
export default {
name: "Updown",
dicts: ["check_type"],
components: {ItemSelectMaterial},
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: {
typeCode: [{ required: true, message: "检验类型", trigger: "blur" }],
checkType: [{ required: true, message: "检验节点", trigger: "blur" }],
materialCode: [{ required: true, message: "物料名称", trigger: "blur" }],
ruleName: [{ required: true, message: "检测项名称", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询物料CPK上下限维护列表 */
getList() {
this.loading = true;
listCpkUpdown(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
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加物料CPK上下限维护";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id =
row.id || this.ids
getCpkUpdown(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改物料CPK上下限维护";
this.getCheckTypeList(this.form.typeCode);
this.getProjectListFunc(this.form.checkType)
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateCpkUpdown(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCpkUpdown(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除数据项?').then(function() {
return delCpkUpdown(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/cpkUpdown/export', {
...this.queryParams
}, `cpkUpDow_${new Date().getTime()}.xlsx`)
},
getCheckTypeList(val) {
getCheckTypeList(val).then((response) => {
this.checkTypeList = response;
});
},
//
productCodeFormate(row, column, cellValue) {
if (cellValue != null) {
return cellValue.slice(7, 18); //
}
},
//
handleSelectProduct() {
this.$refs.itemSelectMaterial.showFlag = true;
},
//
onSelectMaterial(obj) {
this.form.materialName = obj[0].productName;
this.form.materialCode = obj[0].productCode;
},
//
getProjectListFunc(val) {
getProjectOptionList(val).then((response) => {
this.projectNoOptions = response;
});
},
getProjectNameFunc(value){
const selectedOption = this.projectNoOptions.find(option => option.recordId === value);
if (selectedOption) {
this.form.ruleName = selectedOption.ruleName;
}
}
}
};
</script>

@ -0,0 +1,153 @@
<template>
<el-dialog title="BOM物料选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="1000px"
>
<el-row :gutter="20">
<!--BOM数据-->
<el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
<el-form-item label="物料编码" prop="itemCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入物料编码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="itemName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
clearable
style="width: 240px"
@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-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
<el-table-column width="50" align="center" type="selection">
</el-table-column>
<!-- 序号 -->
<el-table-column type="index" width="90" align="center" label="序号"></el-table-column>
<el-table-column label="BOM物料组件编码" align="left" key="productCode" prop="productCode" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件名称" align="left" key="productName" prop="productName" v-if="columns[3].visible" :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 type="primary" @click="submitBomForm"> </el-button>
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import {getProductListBom } from "@/api/mes/mesLine";
export default {
name: "itemSelectMaterial",
data() {
return {
showFlag:false,
//
selectedRows: {},
//
single: true,
//
multiple: false,
//
showSearch: true,
selectedList: [],
//
total: 0,
// BOM
itemList: [],
productList:[],
//
bomCode: undefined,
defaultProps: {
id: "id",
label: "label"
},
//
queryParams: {
pageNum: 1,
pageSize: 10,
productCode: '',
productName: ''
},
//
columns: [
{ key: 0, label: `BOM物料编码`, visible: true },
{ key: 1, label: `产品名称`, visible: true },
{ key: 2, label: `BOM物料组件编码`, visible: true },
{ key: 3, label: `BOM物料组件名称`, visible: true }
]
};
},
created() {
this.getList();
},
methods: {
handleEquipmentSelectionChange (val) {
this.itemList = val
},
/** 查询BOM列表*/
getList() {
this.loading = true;
getProductListBom(this.queryParams).then(response => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleBomSelectionChange(selection) {
if(selection.length==1){
this.productList = selection;
}else{
this.$modal.msgSuccess("请选择一个产品");
}
},
submitBomForm() {
this.$emit('onSelected', this.productList);
this.showFlag = false;
}
}
};
</script>

@ -656,7 +656,13 @@
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="综合结论:" label-width="160px"> <el-form-item label="综合结论:" label-width="160px">
<el-input type="textarea" disabled/> <el-col :span="6">
<span v-if="this.checkResult=='Y'"></span>
<span label="N" v-else>×</span>
</el-col>
<el-col :span="8">
备注:判定合格打不合格打×
</el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -739,6 +745,7 @@ export default {
validateRules: [], validateRules: [],
checkList: [], checkList: [],
standardNo: null, standardNo: null,
checkResult: 'Y',
printData: { printData: {
printable: 'printForm', printable: 'printForm',
ignore: ['no-print'], ignore: ['no-print'],
@ -960,6 +967,7 @@ export default {
this.form.ignore = ['no-print'];// this.form.ignore = ['no-print'];//
this.firstReportOpen = true; this.firstReportOpen = true;
this.title = "首检检验报告"; this.title = "首检检验报告";
this.checkResult = response.data.checkResult;
}) })
this.queryParams.recordId = recordId; this.queryParams.recordId = recordId;
this.getCheckedProjectList(); this.getCheckedProjectList();

@ -544,7 +544,7 @@ export default {
this.checkProjectList0 = itemType0s; this.checkProjectList0 = itemType0s;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
this.form.standardNo = this.checkProjectList[0].standardNo; //this.form.standardNo = this.checkProjectList[0].standardNo;
this.rowspan() this.rowspan()
}); });

@ -9,10 +9,19 @@
<el-col :span="24" :xs="24"> <el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
<el-form-item label="单号"> <el-form-item label="物料名称">
<el-input <el-input
v-model="queryParams.orderNo" v-model="queryParams.materialName"
placeholder="单号" placeholder="物料名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="queryParams.materialCode"
placeholder="物料编码"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -27,8 +36,8 @@
<el-table-column width="50" align="center" type="selection"/> <el-table-column width="50" align="center" type="selection"/>
<el-table-column label="单号" align="left" prop="orderNo" width="120"/> <el-table-column label="单号" align="left" prop="orderNo" width="120"/>
<el-table-column label="产品编码" align="left" prop="materialCode" width="180" /> <el-table-column label="物料编码" align="left" prop="materialCode" width="180" />
<el-table-column label="产品名称" align="left" prop="materialName" width="180"/> <el-table-column label="物料名称" align="left" prop="materialName" width="180"/>
<el-table-column label="数量" align="left" prop="quality" width="100" /> <el-table-column label="数量" align="left" prop="quality" width="100" />
<el-table-column label="仓库编码" align="left" prop="supplierCode"/> <el-table-column label="仓库编码" align="left" prop="supplierCode"/>
<el-table-column label="仓库编名称" align="left" prop="supplierName" width="120"/> <el-table-column label="仓库编名称" align="left" prop="supplierName" width="120"/>

@ -2,6 +2,18 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="送货单号" prop="userDefined5">
<el-input
v-model="queryParams.userDefined5"
placeholder="请输入送货单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购单号" prop="procureCode"> <el-form-item label="采购单号" prop="procureCode">
<el-input <el-input
v-model="queryParams.procureCode" v-model="queryParams.procureCode"

@ -35,7 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`, // target: `http://192.168.202.20:8080`,
target: `http://localhost:8080`,
// target: `http://192.168.3.93:8080`, // target: `http://192.168.3.93:8080`,
// target: `http://192.168.3.158:8080`, // target: `http://192.168.3.158:8080`,
// target: `http://192.168.202.34:30000`, // target: `http://192.168.202.34:30000`,

Loading…
Cancel
Save