meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

Browse Source
This commit is contained in:
caoxinyu
2019-09-30 15:01:30 +08:00
parent b62e2616ba f78dfa9952
commit 6c1892d325
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/PurchasingCenter/CreatePurchaseContract.js
View File

@@ -1,18 +1,28 @@
import request from '@/utils/request'
// 初始化供应商
export function initSupplier(num) {
export function initSupplier() {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: `SELECT distinct 供应商流水号,供应商名称
FROM 采购管理_询价单_视图
where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
name: `SELECT distinct * from 采购管理_供应商`
}
})
}
// export function initSupplier(num) {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '3',
// name: `SELECT distinct 供应商流水号,供应商名称
// FROM 采购管理_询价单_视图
// where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
// }
// })
// }
// 查询询价单列表 表1
export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) {
return request({

2
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -12,7 +12,7 @@
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
</el-row>
</div>
<el-table :data="tableData1" stripe border height="600px" size="mini" show-summary>
<el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
<el-table-column label="名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}

21
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -4,10 +4,10 @@
<el-form label-width="90px" label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="供应商:">
<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange">
<el-form-item label="合同编号:">
<el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" style="width:100%" @change="contractChange">
<el-option
v-for="item in supplier"
v-for="item in contractNums"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -15,10 +15,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号:">
<el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" style="width:100%" @change="contractChange">
<el-form-item label="供应商:">
<!--<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange">-->
<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange9745">
<el-option
v-for="item in contractNums"
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -370,6 +371,7 @@ export default {
},
fetchData() {
initSupplier(this.id).then(res => {
// this.id
this.supplier = []
for (let i = 0; i < res.data.length; i++) {
this.supplier.push({
@@ -446,6 +448,13 @@ export default {
}
})
},
supplierChange9745() {
for (let i = 0; i < this.supplier.length; i++) {
if (this.supplier[i].value === this.supplierValue) {
this.supplierName = this.supplier[i].label
}
}
},
contractChange() { // 选择合同select
searchContractHeader(this.contractNumValue).then(response => {
this.deliveryDate = response.data[0].交货日期