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

离线采购冲突

Browse Source
This commit is contained in:
bryan sun
2019-10-23 19:20:27 +08:00
parent ea3bf600f3 dda5114f52
commit a6fee1fea0
30 changed files with 1105 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/api/PurchasingCenter/CreateInquirySheet.js
View File

@@ -353,7 +353,7 @@ export function searchMerge(num) {
}
})
}
export function getPerson(num) {
export function getPerson() {
return request({
url: '',
method: 'post',
@@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) {
}
})
}
// 查询时间@change修改
export function timeChange1(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_创建询价单_外购件时间修改',
param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2
}
})
}
// 查询时间@change修改
export function timeChange2(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_创建询价单_基本件时间修改',
param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2
}
})
}
// 查询时间初始化查询
export function timeSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_创建询价单_时间查询'
}
})
}

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
}
})

5
src/styles/index.scss
View File

@@ -109,7 +109,7 @@ el-form-item__content{
//background-color: #2e296a!important;
}
.el-card__body{
padding: 10px !important;
padding: 0 10px 0 10px !important;
margin: 0px !important;
}
.app-container{
@@ -275,3 +275,6 @@ h3 {
color: white;
}
}
.el-tabs--border-card>.el-tabs__content {
padding: 15px 15px 0px 15px!important;
}

4
src/utils/request.js
View File

@@ -16,8 +16,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`

4
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -445,8 +445,8 @@ export default {
} // 数据的值
},
legend: { // 图例
left: 'left'
// selectedMode: false, // 图例可点击
left: 'left',
selectedMode: false // 图例可点击
},
dataZoom: [{
type: 'inside',

48
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -29,7 +29,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10;pageList = 1;getTable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -142,30 +142,6 @@
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<!--<el-table-column label="是否外协" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
<!--外协-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否带料" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
<!--带料-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否着急" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
<!--着急-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
<!--</el-input>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
@@ -174,24 +150,20 @@
type="primary"
plain
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize"
:total="total"
style="width:50%;display:inline-block;"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
@@ -268,15 +240,15 @@
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage3"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize3"
:total="total3"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</div>
</el-card>
@@ -426,11 +398,11 @@ export default {
gongyijihua: '',
radio: 0, // 第一组
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 10000, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
total3: 0, // 总条数
pageSize3: 10, // 每页显示条数
pageSize3: 10000, // 每页显示条数
pageList3: 1, // 后台获取页
currentPage3: 1, // 显示当前页
listLoading: false,
@@ -725,7 +697,7 @@ export default {
this.listLoading1 = false
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {
@@ -788,7 +760,7 @@ export default {
this.checked_baitu = false
this.checked_gaonandu = false
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.shijiancuo1 = 0
this.shijiancuo = 0
@@ -1000,7 +972,7 @@ export default {
message: '打回档案成功!'
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {

23
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -48,7 +48,7 @@
style="top: 1px;"
placeholder="选择开始日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
<el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
</el-tooltip>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
@@ -134,24 +134,25 @@
</el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-sizes="[10, 20, 30, 1000000]"
:page-size="pageSize"
:total="total"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
<el-button type="warning" size="small" icon="el-icon-download" @click="Selection">选入</el-button>
</el-tooltip>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
<el-button type="warning" size="small" icon="el-icon-download" @click="SelectionAll">全部选入</el-button>
</div>
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
<el-pagination
:current-page="currentPage5"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-sizes="[10, 20, 30, 1000000]"
:page-size="pageSize5"
:total="total5"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@@ -424,7 +425,7 @@
<el-pagination
:current-page="currentPage1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-size="pageSize1"
:total="total1"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@@ -705,15 +706,15 @@ export default {
tableData2: [], // 导出临时表
length: 0, // 记TABLEDATA1的长度
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 1000000, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
total1: 0, // 总条数
pageSize1: 10, // 每页显示条数
pageSize1: 1000000, // 每页显示条数
pageList1: 1, // 后台获取页
currentPage1: 1, // 显示当前页
total5: 0, // 总条数
pageSize5: 10, // 每页显示条数
pageSize5: 1000000, // 每页显示条数
pageList5: 1, // 后台获取页
currentPage5: 1 // 显示当前页
}

2
src/views/PurchasingCenter/ArrivalStateSearch/index.vue
View File

@@ -28,7 +28,7 @@
border
highlight-current-row
style="width: 100%"
height="400px"
height="600px"
size="mini"
@row-click="searchTable2">
<el-table-column label="采购合同编号" prop="采购合同编号" align="center" min-width="100">

345
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -38,46 +38,35 @@
<el-col :span="24">
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购件" name="外购件">
<el-row style="margin-bottom: 5px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>物料名称:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料变更:</span>
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
</el-row>
<el-row style="margin-bottom: 15px">
<span>物料规格:</span>
<el-row style="margin-bottom: 10px">
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="startTime"
size="small"
@@ -88,7 +77,8 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="timeChange1()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
@@ -105,7 +95,7 @@
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
</el-row>
<el-row style="margin-bottom: 10px">
<el-rows>
<el-table
v-loading=""
:data="tableData11"
@@ -144,7 +134,7 @@
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="机床图号" sortable align="center" min-width="100" prop="机床图号">
<el-table-column label="机床图号" align="center" min-width="100" prop="机床图号">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -169,17 +159,17 @@
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="名称" sortable align="center" min-width="100" prop="名称">
<el-table-column label="名称" align="center" min-width="100" prop="名称">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable align="center" min-width="120" prop="物料型号">
<el-table-column label="图号或型号" align="center" min-width="120" prop="物料型号">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable align="center" min-width="150" prop="物料规格">
<el-table-column label="规格" align="center" min-width="150" prop="物料规格">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
@@ -239,58 +229,48 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</el-row>
<div class="block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
<div class="block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
</el-rows>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-row style="margin-bottom: 5px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>零件图号:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<span>零件名称:</span>
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
<span>零件规格:</span>
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="endTime"
size="small"
@@ -301,7 +281,8 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="timeChange2()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
@@ -422,6 +403,185 @@
@current-change="handleCurrentChange12"/>
</div>
</el-tab-pane>
<!--<el-tab-pane v-show="false" label="标准件" name="标准件">-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span>项目名称:</span>-->
<!--<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>机床图号:</span>-->
<!--<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">-->
<!--<el-option-->
<!--v-for="item in machine"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>组号:</span>-->
<!--<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span style="margin-right: -10px">物料状态:</span>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>-->
<!--<span>零件图号:</span>-->
<!--<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<span>零件名称:</span>-->
<!--<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>-->
<!--<span>零件规格:</span>-->
<!--<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>-->
<!--<span style="margin-left: 10px">时间段:</span>-->
<!--<el-date-picker-->
<!--v-model="endTime"-->
<!--size="small"-->
<!--type="daterange"-->
<!--align="center"-->
<!--value-format="yyyy-MM-dd"-->
<!--format="yyyy-MM-dd"-->
<!--range-separator="～"-->
<!--style="width:250px"-->
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期"/>-->
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>-->
<!--<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>-->
<!--<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in Person"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
<!--</el-popover>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<el-table v-loading="" :data="tableData13" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange3">-->
<!--<el-table-column :selectable="selectable" align="center" type="selection"/>-->
<!--<el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="组号" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料类别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料型号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料名称" label="名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料规格" label="规格" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料规格 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="数量" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="备注" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.备注 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="供货商" label="供货商" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供货商 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购员" min-width="80px" prop="姓名">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.姓名 ? scope.row.姓名 : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">-->
<!--<el-button-->
<!--:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"-->
<!--type="primary"-->
<!--size="mini"-->
<!--plain-->
<!--icon="el-icon-back"-->
<!--@click="retract(scope.row)">撤回</el-button>-->
<!--</el-tooltip>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</el-row>-->
<!--<div class="block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent13"-->
<!--:page-sizes="[10, 20, 30, 40]"-->
<!--:page-size="pageSize13"-->
<!--:total="total13"-->
<!--style="display:inline-block;width:50%"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange13"-->
<!--@current-change="handleCurrentChange13"/>-->
<!--</div>-->
<!--</el-tab-pane>-->
</el-tabs>
</el-col>
</el-row>
@@ -907,7 +1067,7 @@
</template>
<script>
import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
import { timeSearch, timeChange1, timeChange2, tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
import { mapGetters } from 'vuex'
@@ -919,8 +1079,8 @@ export default {
name: '', // 创建询价单
data() {
return {
startTime: '',
endTime: '',
startTime: [],
endTime: [],
标准件和外购件流水号: [],
基本件流水号: [],
visible: false,
@@ -1009,6 +1169,10 @@ export default {
total12: 0,
pageCurrent12: 1,
pageSize12: 100,
tableData13: [], // 外购件列表
total13: 0,
pageCurrent13: 1,
pageSize13: 100,
remarkFilters: [],
supplierFilters: [],
tableData2: [], // 询价单列表
@@ -1108,9 +1272,10 @@ export default {
}
},
created() {
this.timeSearch()
this.getPerson()
this.fetchData()
this.searchTable11() // 查表1
// this.searchTable11() // 查表1
this.searchTable2() // 查表2
this.searchUnInquiryPartNumber()
this.searchUnBuyPartNumber()
@@ -1122,6 +1287,19 @@ export default {
}, 500)
},
methods: {
timeSearch() {
timeSearch().then(response => {
this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
this.searchTable11()
})
},
timeChange1() {
timeChange1(this.startTime[0], this.startTime[1])
},
timeChange2() {
timeChange2(this.endTime[0], this.endTime[1])
},
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
@@ -1521,7 +1699,7 @@ export default {
this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
@@ -1587,6 +1765,41 @@ export default {
this.pageCurrent12 = val
this.searchTable12()
},
searchTable13() { // 查询基本件列表
let check1, check2, check3, check4, check5, check6, check7
this.partNum ? check1 = 1 : check1 = 0
this.partName ? check2 = 1 : check2 = 0
this.partSpec ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
const supplier = []
this.remarkFilters = []
this.supplierFilters = []
response.data.rows.map(v => {
if (!remark.includes(v.备注)) {
remark.push(v.备注)
supplier.push(v.供货商)
this.remarkFilters.push({ text: v.备注, value: v.备注 })
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
})
},
handleSizeChange13(val) { // 基本件列表分页
this.pageSize13 = val
this.pageCurrent13 = 1
this.searchTable13()
},
handleCurrentChange13(val) { // 基本件列表分页
this.pageCurrent13 = val
this.searchTable13()
},
searchTable2() { // 查询询价单列表
this.supplierName ? this.check3 = 1 : this.check3 = 0
this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
@@ -1856,6 +2069,16 @@ export default {
this.基本件流水号[i] = val[i].基本件流水号
}
},
handleSelectionChange3(val) { // 基本件多选
this.groupPartBasicNum = []
this.allNum = []
this.基本件流水号 = []
for (let i = 0; i < val.length; i++) {
this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
this.allNum[i] = val[i].零件数量
this.基本件流水号[i] = val[i].基本件流水号
}
},
addInquirySheet() { // 追加物料
const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
@@ -2062,10 +2285,16 @@ export default {
margin-bottom: 0px;
}
.el-select{
width:200px
width:150px;
margin-right: 10px;
}
.el-input{
width:200px
width:150px;
margin-right: 10px;
}
.el-cascader{
width:150px;
margin: 0px 10px 0px 0px;
}
span{
margin: 10px 0 10px 10px;

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

@@ -1,105 +1,62 @@
<template>
<div class="components-container">
<el-card>
<el-form label-width="90px" label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="供应商:">
<el-select v-model="supplierValue11" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData11()" @change="selectHetong()">
<el-option
v-for="item in supplier11"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</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-option
v-for="item in contractNums"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<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-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange9745">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同名称:">
<el-input v-model="contractName" size="small"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否含税:">
<el-input v-model="taxRate" size="small"/>
</el-form-item>
</el-col>
<el-col :span="1">
<el-tooltip :content="hasTax" placement="top">
<el-switch
v-model="hasTax"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="含税"
inactive-value="未税"
style="margin: 10px"/>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="交货日期:">
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开票信息:">
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="支付日期:">
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支付方式:">
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="21">
<el-form-item label="其他说明:">
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="1">
<el-button v-if="quickChangePrice" size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
</el-col>
</el-row>
</el-form>
<el-row>
<!--<span>供 应 &nbsp;商:</span>-->
<el-select v-model="supplierValue11" clearable filterable size="small" placeholder="供应商" @focus="fetchData11()" @change="selectHetong()">
<el-option
v-for="item in supplier11"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>合同编号:</span>-->
<el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" @change="contractChange">
<el-option
v-for="item in contractNums"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>|| 供 应 商:</span>-->
<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" @focus="fetchData" @change="supplierChange9745">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>合同名称:</span>-->
<el-input v-model="contractName" size="small"/>
<!--<span>是否含税:</span>-->
<el-input :disabled="hasTax==='未税'" v-model="taxRate" size="small" style="width: 80px"/>
<el-tooltip :content="hasTax" placement="top">
<el-switch
v-model="hasTax"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="含税"
inactive-value="未税"/>
</el-tooltip>
</el-row>
<el-row style="margin-top: 10px">
<!--<span>交货日期:</span>-->
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>开票信息:</span>-->
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>支付 日期:</span>-->
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>支付方式:</span>-->
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>其他说明:</span>-->
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
</el-row>
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="交货期" align="center" width="150">
<el-table-column label="交货期" align="center" width="170">
<template slot-scope="scope">
<el-date-picker
v-if="quickChangePrice"
@@ -107,8 +64,7 @@
size="mini"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width:100%"/>
value-format="yyyy-MM-dd"/>
<b v-else>{{ scope.row.交货期.split(' ')[0] || '—' }}</b>
</template>
</el-table-column>
@@ -179,18 +135,13 @@
<el-tooltip v-show="false" :open-delay="1000" content="一键删除交货期" placement="right">
<el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
</el-tooltip>
<span>①选择合同模板：</span>
<el-radio-group v-show="false" v-model="demoRadio" size="small" @change="demoChange">
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
<!--<el-radio-button label="自定义" disabled/>-->
</el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<!--<span>②确认合同总额：</span>-->
<!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
<!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
<span>②递交审批：</span>
<el-tooltip :open-delay="1000" effect="dark" content="核对信息后生成合同" placement="top">
<span>递交审批：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审批" placement="top">
<el-button type="success" size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
@@ -897,9 +848,21 @@ export default {
margin-top: 20px;
}
span{
margin: 0 0 0 20px;
margin: 0 0 0 5px;
}
.el-form-item{
margin: 0;
}
.el-select{
width:150px;
margin-right: 10px;
}
.el-input{
width:150px;
margin-right: 10px;
}
.el-textarea{
width:150px;
margin-right: 10px;
}
</style>

2
src/views/PurchasingCenter/FundApproval1/index.vue
View File

@@ -245,7 +245,6 @@ export default {
},
searchTable1() {
initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
console.log(response.data)
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
@@ -261,7 +260,6 @@ export default {
},
searchTable2() {
initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => {
console.log(response.data.rows)
this.tableData2 = response.data.rows
this.total2 = response.data.total
})

6
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -7,7 +7,7 @@
<el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</div>
<h4 style="margin-top: 5px">发票结算申请单</h4>
<h4 style="margin: 0">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
<el-table-column type="expand">
<template slot-scope="scope">
@@ -115,9 +115,9 @@
</div>
</el-card>
<el-card>
<h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<span>发票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly style="margin: 5px 0 5px 0"/>
<el-table :data="tableData2" border stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">

208
src/views/PurchasingCenter/MaterialMProcure/index.vue
View File

@@ -2,126 +2,88 @@
<div class="app-container">
<el-card>
<el-row>
<el-col style="width: 280px;margin-top: 3px">
<span>物料类别:</span>
<el-select
v-model="MaterialCategoryValue"
placeholder="请选择"
size="small"
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料品种:</span>
<el-select
v-model="MaterialVarietyValue"
placeholder="请选择"
size="small"
clearable
@change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料名称:</span>
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料全称:</span>
<el-input
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料规格:</span>
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料型号:</span>
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px">
<span>计算单位:</span>
<el-select
v-model="MeasurementUnitValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span>物料来源:</span>
<el-select
v-model="MaterialSourceValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in MaterialSource"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span style="margin-left: 15px">供货商:</span>
<el-select
v-model="GonghuoshangValue"
placeholder="请选择"
filterable
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in Gonghuoshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-input-->
<!--v-model="supplier"-->
<!--placeholder="供货商"-->
<!--size="small"-->
<!--style="margin-bottom: 3px;margin-top: 10px"-->
<!--clearable-->
<!--@dblclick.native="param=0;openSupplier()"/>-->
</el-col>
<el-col style="width: 550px">
<el-button
type="success"
icon="el-icon-search"
size="small"
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询</el-button>
<el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
</el-col>
<el-select
v-model="MaterialCategoryValue"
placeholder="物料类别"
size="small"
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="MaterialVarietyValue"
placeholder="物料品种"
size="small"
clearable
@change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
<el-input
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable/>
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable/>
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable/>
<el-select
v-model="MeasurementUnitValue"
placeholder="计算单位"
size="small"
style="width: 80px"
clearable>
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="MaterialSourceValue"
placeholder="物料来源"
size="small"
clearable>
<el-option
v-for="item in MaterialSource"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="GonghuoshangValue"
placeholder="供货商"
filterable
size="small"
clearable>
<el-option
v-for="item in Gonghuoshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
icon="el-icon-search"
size="small"
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询</el-button>
<el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
</el-row>
</el-card>
@@ -720,9 +682,11 @@ export default {
<style scoped>
.el-select{
width:190px
width:150px;
margin-right: 10px;
}
.el-input{
width:190px
width:150px;
margin-right: 10px;
}
</style>

713
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -1,576 +1,151 @@
<template>
<div class="app-container">
<el-row id="PurchasingCenter/OfflineContract">
<el-col :span="24">
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购件" name="外购件">
<el-row style="margin-bottom: 10px">
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="">
<span>物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
<el-table
v-loading=""
:data="tableData00"
:row-class-name="tableRowClassName"
border
show-summary
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
<template slot-scope="scope">
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize00"
:total="total00"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-row style="margin-bottom: 10px">
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="">
<span>物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
<el-table
v-loading=""
:data="tableData00"
:row-class-name="tableRowClassName"
border
show-summary
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
<template slot-scope="scope">
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize00"
:total="total00"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
</el-tab-pane>
<el-tab-pane label="标准件" name="标准件">
<el-row style="margin-bottom: 10px">
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="">
<span>物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
<el-table
v-loading=""
:data="tableData00"
:row-class-name="tableRowClassName"
border
show-summary
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
<template slot-scope="scope">
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize00"
:total="total00"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
</el-tab-pane>
<el-tab-pane label="仓库" name="仓库">
<el-row style="margin-bottom: 10px">
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="">
<span>物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
<el-table
v-loading=""
:data="tableData00"
:row-class-name="tableRowClassName"
border
show-summary
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
<template slot-scope="scope">
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize00"
:total="total00"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
<el-card>
<div slot="header">
<el-row style="margin-bottom: 10px">
<span>物料名称:</span>
<el-row>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
<el-row style="">
<span>库存状态:</span>
<el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable>
</div>
<el-table
v-loading=""
:data="tableData00"
:row-class-name="tableRowClassName"
border
show-summary
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
<template slot-scope="scope">
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize00"
:total="total00"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
</el-card>
<el-card>
<div slot="header">
<el-row>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable style="width: 80px">
<el-option
v-for="item in inventoryState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>采购状态:</span>
<el-select v-model="purchaseStateValue" placeholder="库存状态" size="small">
<el-select v-model="purchaseStateValue" placeholder="库存状态" size="small" style="width: 80px">
<el-option
v-for="item in purchaseState"
:key="item.value"
@@ -1971,7 +1546,6 @@ export default {
</script>
<style scoped>
.offlineContract td{
height: 40px;
text-align: center;
@@ -1981,12 +1555,7 @@ export default {
}
.el-date-editor{
width:150px;
}
.el-select{
width:195px
}
.el-input{
width:195px
margin-right: 10px;
}
span{
margin: 10px 0 10px 10px;
@@ -2005,6 +1574,18 @@ export default {
right: 15px;
top: 5px;
}
.el-select{
width:150px;
margin-right: 10px;
}
.el-input{
width:150px;
margin-right: 10px;
}
.el-cascader{
width:150px;
margin-right: 10px;
}
</style>
<style>
.el-table .MistyRose {

74
src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
View File

@@ -53,43 +53,43 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<!--<el-table-column label="请款付款情况" align="center">-->
<!--</el-table-column>-->
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">

6
src/views/PurchasingCenter/OfflineContractSearch/index.vue
View File

@@ -21,8 +21,8 @@
:data="tableData1"
size="mini"
border
style="width: 100%;max-height: 350px;"
height="350px"
style="width: 100%"
height="500px"
highlight-current-row
@row-click="searchTable2">
<el-table-column label="供应商" align="center" min-width="220">
@@ -116,7 +116,7 @@ export default {
supplierName: '',
total1: 0,
pageCurrent1: 1,
pageSize1: 10,
pageSize1: 20,
tableData1: [],
loading1: false,
contractDetail: []

2
src/views/PurchasingCenter/PayStateSearch/index.vue
View File

@@ -22,7 +22,7 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</div>
<el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" stripe border style="width: 100%" height="800px" size="mini">
<el-table-column type="expand" label="详情" align="center">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">

76
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -75,7 +75,7 @@
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
<div style="margin-top: 10px">
<div>
<span v-show="supplierValue">累计合同总额：</span>
<el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
<span v-show="supplierValue">累计付款：</span>
@@ -106,43 +106,43 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<!--<el-table-column label="请款付款情况" align="center">-->
<!--</el-table-column>-->
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">

4
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -43,8 +43,8 @@
:data="tableData1"
size="mini"
border
style="width: 100%;max-height: 300px;"
height="300px"
style="width: 100%"
height="500px"
highlight-current-row
@row-click="searchTable2">
<el-table-column type="expand" label="详情">

23
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -13,7 +13,6 @@
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期"/>-->
<el-row>
<span>合同编号:</span>
<!--<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in contractNum"-->
@@ -24,10 +23,11 @@
<!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
<!--</el-option>-->
<!--</el-select>-->
<!--<span>合同编号:</span>-->
<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/>
<span>供应商:</span>
<!--<span>供应商:</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
<span>采购员:</span>
<!--<span>采购员:</span>-->
<el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
<el-option
v-for="item in person"
@@ -35,10 +35,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-top: 15px">
<span>审核情况:</span>
<!--<span>审核情况:</span>-->
<el-select v-model="revieweValue" placeholder="审核情况" size="small" style="width: 100px">
<el-option
v-for="item in reviewe"
@@ -46,7 +43,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>审批情况:</span>
<!--<span>审批情况:</span>-->
<el-select v-model="approvalValue" placeholder="审批情况" size="small" style="width: 100px">
<el-option
v-for="item in approval"
@@ -185,7 +182,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[20, 30, 40, 100]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
@@ -261,7 +258,7 @@ export default {
supplierName: '',
total1: 0,
pageCurrent1: 1,
pageSize1: 10,
pageSize1: 30,
tableData1: [],
loading1: false,
returns: '',
@@ -430,10 +427,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;

60
src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
View File

@@ -13,39 +13,35 @@
{{ scope.row.申请人姓名 }}
</template>
</el-table-column>
<el-table-column label="原物料" align="center">
<el-table-column label="原物料名称" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料名称 }}
</template>
</el-table-column>
<el-table-column label="原物料规格" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料规格 }}
</template>
</el-table-column>
<el-table-column label="原物料型号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料型号 }}
</template>
</el-table-column>
<el-table-column label="原物料名称" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料名称 }}
</template>
</el-table-column>
<el-table-column label="新物料" align="center">
<el-table-column label="新物料名称" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料名称 }}
</template>
</el-table-column>
<el-table-column label="新物料规格" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料规格 }}
</template>
</el-table-column>
<el-table-column label="新物料型号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料型号 }}
</template>
</el-table-column>
<el-table-column label="原物料规格" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料规格 }}
</template>
</el-table-column>
<el-table-column label="原物料型号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.原物料型号 }}
</template>
</el-table-column>
<el-table-column label="新物料名称" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料名称 }}
</template>
</el-table-column>
<el-table-column label="新物料规格" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料规格 }}
</template>
</el-table-column>
<el-table-column label="新物料型号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.新物料型号 }}
</template>
</el-table-column>
<el-table-column label="是否同意修改" width="200px" align="center" fixed="right">
<template slot-scope="scope">

25
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -2,7 +2,6 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
@@ -13,7 +12,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
<el-option
v-for="item in groupNumber"
@@ -21,14 +19,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
<el-input v-model="Name" placeholder="名称" size="small" clearable style="width:200px"/>
</el-row>
<el-row style="margin-top:10px">
<span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
<el-input v-model="spec" placeholder="规格" size="small" clearable style="width:200px"/>
<span>型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px"/>
<el-input v-model="Name" placeholder="名称" size="small" clearable/>
<el-input v-model="spec" placeholder="规格" size="small" clearable/>
<el-input v-model="model" placeholder="型号" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
@@ -38,7 +31,7 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe>
<el-table :data="tableData0" size="mini" height="700px" border stripe>
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="100px">
<template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -126,7 +119,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
<el-table :data="tableData1" size="mini" height="700px" border stripe>
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px">
<template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -214,7 +207,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
<el-table :data="tableData2" size="mini" height="700px" border stripe>
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px">
<template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -546,10 +539,12 @@ export default {
margin-bottom: 0px;
}
.el-select{
width:200px
width:150px;
margin-right: 10px;
}
.el-input{
width:200px
width:150px;
margin-right: 10px;
}
span{
margin: 10px 0 10px 10px;

236
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -19,10 +19,9 @@
<el-divider content-position="right"/>
</div>
</el-card>
<el-tabs v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
<el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
<el-tab-pane label="标准件" name="标准件">
<el-row style="margin-bottom: 5px">
<span style="margin-left: 0">项目名称:</span>
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
@@ -30,7 +29,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machine"
@@ -41,7 +39,6 @@
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
</el-option>
</el-select>
<span style="margin-left: 5px">组号:</span>
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">
<el-option
v-for="item in group"
@@ -49,8 +46,8 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-show="false"
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
@@ -62,14 +59,10 @@
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-row>
<el-row style="margin-bottom: 5px">
<span>物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px" style="margin-top: 5px"/>
<span style="margin-left: 0">物料类别:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>
<el-select
v-model="MaterialCategoryValue"
placeholder="请选择物料类别"
placeholder="物料类别"
size="small"
clearable
@change="searchMaterialVariety">
@@ -79,18 +72,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>物料品种:</span>
<el-select
v-model="MaterialVarietyValue"
placeholder="请选择物料品种"
size="small"
clearable>
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<div style="float:right;">
<span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -102,20 +83,23 @@
</el-select>
</div>
</el-row>
<el-row style="margin-bottom: 10px">
<span style="margin-left: 0">物料名称:</span>
<el-input v-model="materialName" placeholder="请选择物料名称" size="small" style="margin-top: 5px" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="请选择物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="请选择物料型号" size="small" clearable/>
<el-button
type="success"
<el-row style="margin-bottom: 5px">
<el-select
v-model="MaterialVarietyValue"
placeholder="物料品种"
size="small"
icon="el-icon-search"
style="margin-left: 10px;"
@click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
<div style="float:right;padding-top:5px;">
clearable>
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
<div style="float:right">
<el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
<el-button
type="primary"
@@ -135,7 +119,7 @@
</div>
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
<el-table v-loading="" :data="tableData0" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
<template slot-scope="scope">
@@ -254,7 +238,6 @@
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-row style="margin-bottom: 5px">
<span style="margin-left: 0">项目名称:</span>
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
@@ -262,7 +245,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machine"
@@ -273,12 +255,26 @@
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
</el-option>
</el-select>
<el-button
type="success"
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-select
v-model="MaterialCategoryValue"
placeholder="物料类别"
size="small"
icon="el-icon-search"
style="margin-left: 10px;"
@click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<div style="float:right;">
<span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -291,17 +287,27 @@
</div>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-left: 0">组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
<el-select
v-model="MaterialVarietyValue"
placeholder="物料品种"
size="small"
clearable>
<el-option
v-for="item in group"
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<div style="float:right;padding-top:10px;">
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px;"
@click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
<div style="float:right">
<el-button
type="primary"
size="small"
@@ -316,43 +322,8 @@
@click="executeReturn1">退回</el-button>
</div>
</el-row>
<el-row style="margin-bottom: 15px">
<span style="margin-left: 0">物料类别:</span>
<el-select
v-model="MaterialCategoryValue"
placeholder="请选择"
size="small"
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>物料品种:</span>
<el-select
v-model="MaterialVarietyValue"
placeholder="请选择"
size="small"
clearable>
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-bottom: 15px">
<span style="margin-left: 0">物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData1" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
<el-table v-loading="" :data="tableData1" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="100px">
<template slot-scope="scope">
@@ -468,7 +439,6 @@
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-row style="margin-bottom: 5px">
<span style="margin-left: 0">项目名称:</span>
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
@@ -476,7 +446,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machine"
@@ -487,12 +456,15 @@
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
</el-option>
</el-select>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px;"
@click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
<div style="float:right">
<span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -505,17 +477,16 @@
</div>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-left: 0">组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<div style="float:right;padding-top: 10px">
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
<el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px;"
@click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
<div style="float:right">
<el-button
type="primary"
size="small"
@@ -530,20 +501,8 @@
@click="executeReturn2">退回</el-button>
</div>
</el-row>
<el-row style="margin-bottom: 15px">
<span style="margin-left: 0">零件图号:</span>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
<span>零件名称:</span>
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 15px">
<span style="margin-left: 0">零件规格:</span>
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
<span>零件材料:</span>
<el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData2" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange2">
<el-table v-loading="" :data="tableData2" size="mini" height="800px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="80px">
<template slot-scope="scope">
@@ -787,6 +746,19 @@ export default {
'id'
])
},
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'PurchaseTaskAllocate') {
setTimeout(() => {
_this.Jump()
}, 1200)
}
}
}
},
created() {
this.searchTable0() // 查表1
this.fetchData() // 初始化数据
@@ -794,10 +766,18 @@ export default {
this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
this.getDefaultTime()
},
mounted() {
setTimeout(() => {
this.Jump()
}, 500)
},
beforeDestroy() {
clearInterval(this.timer2)
},
methods: {
Jump() {
window.location.hash = '#PurchasingCenter/PurchaseTaskAllocate'
},
getDefaultTime() {
const end = new Date()
const start = new Date()
@@ -914,20 +894,22 @@ export default {
searchMaterialVariety() { // 初始化物料品种
this.MaterialVariety = []
this.MaterialVarietyValue = ''
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
if (this.MaterialCategoryValue) {
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
}
},
searchTable0() { // 查询标准件
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
let check0, check1, check2, check3, check4
let check0, check1, check2, check3
this.machineValue ? check0 = 1 : check0 = 0
this.groupValue ? check1 = 1 : check1 = 0
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.dateRange ? check4 = 1 : (check4 = 0, this.dateRange = '')
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, check4, this.dateRange[0], this.dateRange[1]).then(response => {
// this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
})
@@ -1142,10 +1124,16 @@ export default {
margin-bottom: 0px;
}
.el-select{
width:200px
width:150px;
margin-right: 10px;
}
.el-input{
width:200px
width:150px;
margin-right: 10px;
}
.el-cascader{
width:150px;
margin-right: 10px;
}
</style>
<style rel="stylesheet/scss" lang="scss" scoped>

27
src/views/PurchasingCenter/SetPayPlan/index.vue
View File

@@ -29,8 +29,8 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
border
style="width: 100%;max-height: 250px;"
height="250px"
style="width: 100%;"
height="500px"
size="mini"
@row-click="searchContract"
@expand-change="searchPlan">
@@ -302,18 +302,15 @@ export default {
margin: 0
}
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

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;

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

@@ -27,15 +27,12 @@
</el-col>
<el-col style="margin-left: 0px">
<span>零件图号:</span>
<el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
<el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0" @keyup.enter.native="searchTable1"/>
<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="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
<el-button type="danger" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回重新分配</el-button>
<el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
</el-tooltip>
<el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
@@ -60,7 +57,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,11 +75,21 @@
<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>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
<el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>
</el-tooltip>
@@ -126,21 +133,21 @@
{{ scope.row.计划完成日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" fixed="right">
<el-table-column label="操作" align="center" width="350" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-printer" @click="exportExcel(scope.row)"/>
<el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印采购计划</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 20px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
<el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)">编辑</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
<el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)">删除</el-button>
</div>
</el-tooltip>
</template>
@@ -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;

77
src/views/layout/components/Navbar.vue
View File

@@ -31,6 +31,7 @@ import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
export default {
components: {
Breadcrumb,
@@ -39,7 +40,12 @@ export default {
data() {
return {
timer: '',
noticeContract: null,
noticeContract1: null,
noticeContract2: null,
noticeContract3: null,
noticeContract4: null,
noticeContract5: null,
noticeContract6: null,
noticeFund: null,
noticeInvoice: null
}
@@ -73,31 +79,82 @@ export default {
comfirmMaterial_CG() {
getMaterial_NOTES().then(res => {
if (res.data.length) {
this.noticeContract = null
this.noticeContract = this.$notify.success({
this.noticeContract1 = null
this.noticeContract1 = this.$notify.success({
title: '提示',
message: '有新采购物料审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' })
setTimeout(this.noticeContract.close(), 1000)
setTimeout(this.noticeContract1.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
if (this.token.toString() === '2') {
searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => {
if (res.data.length) {
this.noticeContract2 = null
this.noticeContract2 = this.$notify.success({
title: '提示',
message: '有合同请款申请审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract2.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
initApproval(1, 999, 1).then(res => {
if (res.data.rows.length) {
this.noticeContract3 = null
this.noticeContract3 = this.$notify.success({
title: '提示',
message: '有合同请款申请待审批，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/FundApproval1' })
setTimeout(this.noticeContract3.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
} else if (this.token.toString() === '3') {
searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => {
if (res.data.length) {
this.noticeContract4 = null
this.noticeContract4 = this.$notify.success({
title: '提示',
message: '有合同请款申请审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract4.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
}
},
comfirmMaterial() {
getMaterial().then(res => {
if (res.data.length) {
this.noticeContract = null
this.noticeContract = this.$notify.success({
this.noticeContract5 = null
this.noticeContract5 = this.$notify.success({
title: '提示',
message: '您有采购物料申请待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/MaterialManagement' })
setTimeout(this.noticeContract.close(), 1000)
setTimeout(this.noticeContract5.close(), 1000)
},
duration: 1000 * 60
})
@@ -107,13 +164,13 @@ export default {
checkApproval() {
searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
if (res.data.total) {
this.noticeContract = null
this.noticeContract = this.$notify.success({
this.noticeContract6 = null
this.noticeContract6 = this.$notify.success({
title: '提示',
message: '您有采购合同待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' })
setTimeout(this.noticeContract.close(), 1000)
setTimeout(this.noticeContract6.close(), 1000)
},
duration: 1000 * 60
})