Commit aff0696b authored by chenzj's avatar chenzj

bug修复

parent 96d529a2
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="成品物料号" prop="itemCode"> <el-form-item label="成品物料号" prop="itemCode">
<el-input <el-input v-model="queryParams.itemCode" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.itemCode"
placeholder="请输入成品物料号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="成品物名称" prop="itemName"> <el-form-item label="成品物名称" prop="itemName">
<el-input <el-input v-model="queryParams.itemName" clearable placeholder="请输入成品物名称" @keyup.enter.native="handleQuery">
v-model="queryParams.itemName"
clearable
placeholder="请输入成品物名称"
@keyup.enter.native="handleQuery"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="组件号" prop="groupCounter"> <el-form-item label="组件号" prop="groupCounter">
<el-input <el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery">
v-model="queryParams.groupCounter"
clearable
placeholder="请输入组件号"
@keyup.enter.native="handleQuery"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="打样订单号" prop="sapPrototypeMakeCode"> <el-form-item label="打样订单号" prop="sapPrototypeMakeCode">
<el-input <el-input v-model="queryParams.sapPrototypeMakeCode" clearable placeholder="请输入打样订单号"
v-model="queryParams.sapPrototypeMakeCode" @keyup.enter.native="handleQuery">
clearable
placeholder="请输入打样订单号"
@keyup.enter.native="handleQuery"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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-item>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="productionSolutionList" row-key="productionSolutionId" default-expand-all>
v-loading="loading"
:data="productionSolutionList"
row-key="productionSolutionId"
default-expand-all
>
<el-table-column label="生产版本编码" prop="productionSolutionCode"> <el-table-column label="生产版本编码" prop="productionSolutionCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" @click="handleView(scope.row)"
size="mini" v-hasPermi="['pro:productionSolutionCode:query']">{{ scope.row.productionSolutionCode }}</el-button>
type="text"
@click="handleView(scope.row)"
v-hasPermi="['pro:productionSolutionCode:query']"
>{{ scope.row.productionSolutionCode }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组件号" align="center" prop="groupCounter" /> <el-table-column label="组件号" align="center" prop="groupCounter" />
<el-table-column <el-table-column label="产品版本名称" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
label="产品版本名称"
align="center"
prop="productionSolutionName"
:show-overflow-tooltip="true"
/>
<el-table-column label="成品物料编码" align="center" prop="itemCode" /> <el-table-column label="成品物料编码" align="center" prop="itemCode" />
<el-table-column label="成品物料名称" align="center" prop="itemName" /> <el-table-column label="成品物料名称" align="center" prop="itemName" />
<el-table-column label="生产用途" align="center" prop="usageName" /> <el-table-column label="生产用途" align="center" prop="usageName" />
...@@ -94,9 +45,9 @@ ...@@ -94,9 +45,9 @@
/> />
</template> </template>
</el-table-column> --> </el-table-column> -->
<!-- <el-table-column label="备注" align="center" prop="usageName" width="180"/> --> <!-- <el-table-column label="备注" align="center" prop="usageName" width="180"/> -->
<!-- <!--
<el-table-column <el-table-column
label="操作" label="操作"
width="200px" width="200px"
...@@ -117,13 +68,8 @@ ...@@ -117,13 +68,8 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total > 0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>
...@@ -296,7 +242,7 @@ export default { ...@@ -296,7 +242,7 @@ export default {
const productionSolutionId = row.productionSolutionId || this.ids; const productionSolutionId = row.productionSolutionId || this.ids;
this.$router.push( this.$router.push(
"/mes/pro/productionSolution/info?productionSolutionId=" + "/mes/pro/productionSolution/info?productionSolutionId=" +
productionSolutionId productionSolutionId
); );
// getprototypeRequest(prototypeRequestId).then((response) => { // getprototypeRequest(prototypeRequestId).then((response) => {
// this.form = response.data; // this.form = response.data;
...@@ -311,7 +257,7 @@ export default { ...@@ -311,7 +257,7 @@ export default {
const productionSolutionId = row.productionSolutionId || this.ids; const productionSolutionId = row.productionSolutionId || this.ids;
this.$router.push( this.$router.push(
"/mes/pro/productionSolution/edit?productionSolutionId=" + "/mes/pro/productionSolution/edit?productionSolutionId=" +
productionSolutionId productionSolutionId
); );
// getPrototypeRequest(prototypeRequestId).then((response) => { // getPrototypeRequest(prototypeRequestId).then((response) => {
// // this.form = response.data; // // this.form = response.data;
...@@ -332,7 +278,7 @@ export default { ...@@ -332,7 +278,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
handleSelectProduct() { handleSelectProduct() {
...@@ -364,7 +310,7 @@ export default { ...@@ -364,7 +310,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
// 生成制作单 // 生成制作单
generatea(row) { generatea(row) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment