Commit 7b66a90d authored by 沈翠玲's avatar 沈翠玲

修复bug

parent af306542
import request from '@/utils/request'
// 查询客户对照列表
export function listClientItem(query) {
return request({
url: '/md/clientItem/list',
method: 'get',
params: query
})
}
\ No newline at end of file
<template>
<div class="app-container">
<el-form :model="pageReq" ref="queryForm" size="small" inline v-show="showSearch">
<el-form-item label="客户名称" prop="clientId">
<el-input v-model="pageReq.clientName" placeholder="请输入客户名称" clearable @keyup.enter.native="getList(1)"/>
</el-form-item>
<el-form-item label="产品" prop="itemId">
<el-input v-model="pageReq.itemName" placeholder="请输入产品" clearable @keyup.enter.native="getList(1)"/>
</el-form-item>
<el-form-item label="物料类型编码" prop="itemType">
<item-type-tree v-model="pageReq.itemTypeCode" clearable/>
</el-form-item>
<el-form-item label="客户产品编码" prop="clientItemCode">
<el-input v-model="pageReq.clientItemCode" placeholder="请输入客户产品编码" clearable @keyup.enter.native="getList(1)"/>
</el-form-item>
<el-form-item label="客户产品名称" prop="clientItemName">
<el-input v-model="pageReq.clientItemName" placeholder="请输入客户产品名称" clearable @keyup.enter.native="getList(1)"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList(1)">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="getList(0)">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="tableLoading" :data="page.rows" >
<el-table-column label="客户编码" prop="clientCode" show-overflow-tooltip/>
<el-table-column label="客户名称" prop="clientName" show-overflow-tooltip/>
<el-table-column label="产品编码" prop="sapItemCode" show-overflow-tooltip/>
<el-table-column label="产品名称" prop="itemName" show-overflow-tooltip/>
<el-table-column label="物料类型编码" prop="itemTypeCode" show-overflow-tooltip/>
<el-table-column label="品牌" prop="brandName" show-overflow-tooltip/>
<el-table-column label="基本单位" prop="itemUnitOfMeasure" width="100"/>
<el-table-column label="客户单位" prop="clientUnitOfMeasure" width="100"/>
<el-table-column label="换算关系" prop="exchange" width="100"/>
<el-table-column label="客户产品编码" prop="clientItemCode" show-overflow-tooltip/>
<el-table-column label="客户产品名称" prop="clientItemName" show-overflow-tooltip/>
<el-table-column label="备注" prop="remark" max-width="150" show-overflow-tooltip/>
<el-table-column label="创建人" prop="createBy" width="80"/>
<el-table-column label="创建时间" prop="createTime" width="100"/>
<el-table-column label="更新人" prop="updateBy" width="80"/>
<el-table-column label="更新时间" prop="updateTime" width="100"/>
</el-table>
<pagination v-show="page.total>0" :total="+page.total" :page.sync="pageReq.current" :limit.sync="pageReq.size" @pagination="getList"/>
</div>
</template>
<script>
import {
listClientItem
} from '@/api/mes/pro/ClientItemRelation.js'
export default {
components: {
},
data() {
return {
ids: [],
showSearch: true,
tableLoading: false,
pageReq: {
current: 1,
size: 10,
clientId: null,
itemId: null,
itemType: null,
brandId: null,
clientItemCode: null,
clientItemName: null
},
page: {total: 0, rows: []},
showEdit: false,
loading: false,
form: {
clientId: null,
itemId: null,
itemType: null,
brandId: null,
unit: null,
clientItemCode: null,
clientItemName: null,
clientUnit: null,
exchange: null,
}
}
},
methods: {
getList(num) {
if (num === 1 || num === 0) this.pageReq.current = 1
if (num === 0) this.$refs.queryForm.resetFields()
this.tableLoading = true
listClientItem(this.pageReq).then(res => this.page = res).finally(() => this.tableLoading = false)
},
},
created() {
this.getList()
},
}
</script>
\ No newline at end of file
......@@ -7,9 +7,9 @@
<el-table-column label="检验结果" width="300" align="center" prop="qualityCheckResults">
<template slot-scope="scope">
<div>
<el-checkbox-group v-if="scope.row.inputType == 2" v-model="scope.row.qualityCheckResults">
<el-checkbox v-for="(item, index) in scope.row.selectValues" :key="index" :label="item.name"></el-checkbox>
</el-checkbox-group>
<el-radio-group v-if="scope.row.inputType == 2" v-model="scope.row.qualityCheckResults">
<el-radio v-for="(item, index) in scope.row.selectValues" :key="index" :label="item.name"></el-radio>
</el-radio-group>
<el-input v-else v-model="scope.row.qualityCheckResults" placeholder="请输入检验结果"></el-input>
</div>
</template>
......
......@@ -124,10 +124,10 @@
>
</template>
</el-table-column>
<el-table-column label="编排单号" align="center" prop="batchNumber" />
<el-table-column label="编排单号" align="center" width="100" prop="batchNumber" />
<el-table-column label="工序编号" align="center" prop="processCode" />
<el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="作业单元" align="center" prop="workstationName" />
<el-table-column label="作业单元" align="center" width="120" prop="workstationName" />
<!-- <el-table-column label="工作单元名称" align="center" prop="workstationName" /> -->
<el-table-column label="异常类型" align="center" prop="abnormalType" >
<template slot-scope="scope">
......
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