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

备料

Browse Source
This commit is contained in:
zhangdingyu
2019-10-23 16:49:02 +08:00
parent b1be1eaee9
commit 72eb62a5b0
6 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
View File

@@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) {
})
}
// 查询外购备料
export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) {
export function searchPurchasedMaterials(check1, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_外购备料_查询数据',
param: `零件图号_check=${check1}&零件图号=${name}`,
Pagination: pageCurrent + '&' + pageSize
param: `零件图号_check=${check1}&零件图号=${name}`
}
})
}
// 查询采购单
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) {
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_采购计划_查询数据',
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
Pagination: pageCurrent + '&' + pageSize
}
})

4
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -37,14 +37,14 @@ export function searchMateriel(num, num1) {
})
}
// 查询到货单
export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_到货单查询_新',
param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
Pagination: pageCurrent + '&' + pageSize
}
})

99
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -1,72 +1,35 @@
<template>
<div class="app-container">
<el-card class="searchContract">
<el-form ref="form1" :model="form1" label-position="right" label-width="130px" class="searchForm">
<el-row>
<el-col style="width: 280px">
<el-form-item label="请购单号/合同编号">
<el-select v-model="contractNumValue" size="small" @change="searchData">
<el-option
v-for="item in contractNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="合同名称">
<el-input v-model="contractName" size="small"/>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="供应商">
<el-input v-model="supplierName" size="small" placeholder="请双击选择" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="预付款">
<el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 280px">
<el-form-item label="币种">
<el-select v-model="currencyValue" placeholder="币种" size="small" clearable>
<el-option
v-for="item in currency"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="规定到货时间">
<el-date-picker
v-model="stipulateArrivalTime"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="采购员">
<el-input v-model="name" size="small" readonly/>
</el-form-item>
</el-col>
<el-col style="width: 280px">
<el-form-item label="税率">
<el-input v-model="taxRate" size="small"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row>
<el-select v-model="contractNumValue" placeholder="请购单号/合同编号" size="small" @change="searchData">
<el-option
v-for="item in contractNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="contractName" placeholder="合同名称" size="small"/>
<el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>
<el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
<el-select v-model="currencyValue" placeholder="币种" size="small" clearable>
<el-option
v-for="item in currency"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-date-picker
v-model="stipulateArrivalTime"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="规定到货时间"/>
<el-input v-model="name" placeholder="采购员" size="small" readonly/>
<el-input v-model="taxRate" placeholder="税率" size="small"/>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
<el-table-column label="零件名称" align="center" min-width="100">
@@ -632,10 +595,12 @@ export default {
width:200px
}
.el-select{
width:160px
width:150px;
margin-right: 10px;
}
.el-input{
width:160px
width:150px;
margin-right: 10px;
}
span{
margin: 10px 0 10px 10px;

23
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -60,7 +60,7 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<div v-show="false" class="block">
<el-pagination
:current-page="pageCurrent1"
:page-size="pageSize1"
@@ -78,7 +78,14 @@
<span>采购计划单号:</span>
<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-select v-model="supplierName0" placeholder="供应商" size="small" filterable clearable>
<el-option
v-for="item in supplierName0s"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
</el-tooltip>
@@ -354,6 +361,7 @@ export default {
purchasingOrder: '', // 采购单号
purchasingOrderNumber: '', // 采购计划流水号
supplierName0: '', // 供应商名称（外面的）
supplierName0s: [], // 供应商名称（外面的）
supplierName: '', // 供应商名称
tableData2: [],
total2: 0,
@@ -435,6 +443,10 @@ export default {
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
this.supplierName0s.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => {
@@ -509,8 +521,9 @@ export default {
searchTable1() { // 查询外购备料
this.loading1 = true
this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0
searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => {
this.tableData1 = response.data.rows
// this.pageCurrent1, this.pageSize1,
searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => {
this.tableData1 = response.data
this.total1 = response.data.total
this.loading1 = false
})
@@ -533,7 +546,7 @@ export default {
searchTable2() { // 查询采购单列表
this.purchasingOrder ? this.check3 = 1 : this.check3 = 0
this.supplierName0 ? this.check4 = 1 : this.check4 = 0
searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName0).then(response => {
searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
})

26
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -3,7 +3,14 @@
<el-card>
<div>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="Name" placeholder="供应商" size="small" clearable/>
<el-select v-model="supplierNameValue" placeholder="供应商" size="small" filterable clearable>
<el-option
v-for="item in supplierName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-input v-model="Name" placeholder="供应商" size="small" clearable/>-->
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
@@ -420,6 +427,8 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
supplierNameValue: '',
supplierName: [], // 供应商
Cailiao: [],
purchasingOrder: '',
ArrivalOrderNumber: '',
@@ -503,10 +512,21 @@ export default {
])
},
created() {
this.fetchdata()
this.searchTable2()
this.searchTable4()
},
methods: {
fetchdata() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) {
this.supplierName.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
searchCailiao() {
this.Cailiao = []
searchCailiao(this.供应商111).then(response => {
@@ -637,14 +657,14 @@ export default {
searchTable4() {
this.tableData5 = []
this.tableData6 = []
this.Name ? this.check = 1 : this.check = 0
this.supplierNameValue ? this.check = 1 : this.check = 0
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
if (this.PickingValue === 0 || this.PickingValue === 1) {
this.check2 = 1
} else {
this.check2 = 0
}
searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
searchArriveOrder(0, 0, this.check, this.supplierNameValue, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
this.tableData4 = response.data.rows
this.total4 = response.data.total
})

69
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -1,35 +1,36 @@
<template>
<div class="app-container">
<el-card>
<span>合 &nbsp;同 &nbsp;号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
<el-option
v-for="item in contractNum"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>采购员:</span>
<el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/><br>
<span>审批情况:</span>
<el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable style="margin-top: 5px">
<el-option
v-for="item in approval"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left:10px;margin-top: 5px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-row>
<!--<span>合 &nbsp;同 &nbsp;号:</span>-->
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
<el-option
v-for="item in contractNum"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<!--<span>采购员:</span>-->
<el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
<!--<span>供应商:</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<!--<span>审批情况:</span>-->
<el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable>
<el-option
v-for="item in approval"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
size="small"
icon="el-icon-search"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-row>
</el-card>
<el-card>
@@ -39,8 +40,8 @@
:row-class-name="tableRowClassName"
size="mini"
border
style="width: 100%;max-height: 300px;"
height="300px"
style="width: 100%"
height="700px"
highlight-current-row
@row-click="searchTable2">
<el-table-column label="采购合同号" align="center">
@@ -616,10 +617,12 @@ export default {
width:200px
}
.el-select{
width:200px
width:150px;
margin-right: 10px;
}
.el-input{
width:200px
width:150px;
margin-right: 10px;
}
span{
margin: 10px 0 10px 10px;