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

更新

Browse Source
This commit is contained in:
liushuai
2019-10-18 14:09:26 +08:00
parent a57367ae36 1989b23ce9
commit b61c5180f7
25 changed files with 338 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,14 +76,14 @@ export function getExport2(num) {
}) })
} }
// 查询分配后的标准件和外购件 // 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) { export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`, param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

12
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -41,34 +41,34 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px"> <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table-column align="center" label="检验情况" width="80px"> <el-table-column align="center" sortable prop="是否合格" label="检验情况" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag> <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===1" type="success" size="small">合格</el-tag> <el-tag v-if="parseInt(scope.row.是否合格)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===2" type="error" size="small">不合格</el-tag> <el-tag v-if="parseInt(scope.row.是否合格)===2" type="error" size="small">不合格</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" width="120px"> <el-table-column label="机床图号" sortable prop="机床图号" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" width="260px"> <el-table-column label="机床名称" sortable prop="机床名称" align="center" width="260px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" width="100px"> <el-table-column label="组号" sortable prop="组号" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="部件名称" align="center" width="100px"> <el-table-column label="部件名称" sortable prop="组件名称" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组件名称 }} {{ scope.row.组件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测项" align="center" width="100px"> <el-table-column label="检测项" sortable prop="检测项" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.检测项 }} {{ scope.row.检测项 }}
</template> </template>

32
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -256,27 +256,27 @@
<el-card> <el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4> <h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px"> <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center"> <el-table-column label="机床图号" sortable prop="机床图号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" min-width="200px"> <el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center"> <el-table-column label="组号" sortable prop="组号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" min-width="110px"> <el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center"> <el-table-column label="零件名称" sortable prop="零件名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -286,17 +286,17 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序名称" align="center"> <el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" width="100px"> <el-table-column label="工位" sortable prop="终端编号" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.终端编号 }} {{ scope.row.终端编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作工" align="center"> <el-table-column label="操作工" sortable prop="姓名" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
@@ -326,27 +326,27 @@
<el-card> <el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4> <h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px"> <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center" width="110px"> <el-table-column label="机床图号" sortable prop="机床图号" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" min-width="200px"> <el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" width="70px"> <el-table-column label="组号" sortable prop="组号" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="140px"> <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" min-width="120px"> <el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -356,17 +356,17 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序名称" align="center"> <el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" width="80px"> <el-table-column label="工位" sortable prop="mes终端编号" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.mes终端编号 }} {{ scope.row.mes终端编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作工" align="center"> <el-table-column label="操作工" sortable prop="姓名" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>

72
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -37,33 +37,27 @@
<el-tab-pane label="标准件" name="标准件"> <el-tab-pane label="标准件" name="标准件">
<el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/> <el-table-column type="selection" align="center" width="50"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope">
<el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
<el-tag v-else type="primary" size="small">已领</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" min-width="80px"> <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>date
</el-table-column> </el-table-column>
<el-table-column align="center" label="型号" min-width="100px"> <el-table-column align="center" sortable prop="型号" label="型号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 || '—' }} {{ scope.row.物料型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="200px"> <el-table-column align="center" sortable prop="规格排序" label="规格" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 || '—' }} {{ scope.row.物料规格 || '—' }}
</template> </template>
@@ -104,33 +98,27 @@
<el-tab-pane label="外购件" name="外购件"> <el-tab-pane label="外购件" name="外购件">
<el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/> <el-table-column type="selection" align="center" width="50"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope">
<el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
<el-tag v-else type="primary" size="small">已领</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" min-width="80px"> <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="型号" min-width="100px"> <el-table-column align="center" sortable prop="型号" label="型号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 || '—' }} {{ scope.row.物料型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="200px"> <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 || '—' }} {{ scope.row.物料规格 || '—' }}
</template> </template>
@@ -166,33 +154,27 @@
<el-tab-pane label="基本件" name="基本件"> <el-tab-pane label="基本件" name="基本件">
<el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/> <el-table-column type="selection" align="center" width="50"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope">
<el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
<el-tag v-else type="primary" size="small">已领</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" min-width="80px"> <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="零件名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" min-width="100px"> <el-table-column align="center" label="图号" sortable prop="零件图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="100px"> <el-table-column align="center" sortable prop="规格" label="规格" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
@@ -246,7 +228,7 @@
</el-tooltip> </el-tooltip>
<el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList"> <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="领料单编号" align="center" min-width="200"> <el-table-column sortable prop="领料单编号" label="领料单编号" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
@@ -256,17 +238,17 @@
{{ scope.row.操作日期.split(' ')[0] }} {{ scope.row.操作日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料人" align="center" min-width="130"> <el-table-column label="领料人" sortable prop="领料人" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料单备注" align="center" min-width="130"> <el-table-column label="领料单备注" sortable prop="领料单备注" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单备注 }} {{ scope.row.领料单备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批" align="center" min-width="90"> <el-table-column label="审批" sortable prop="审批" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag> <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
<el-tag v-else type="warning">未审批</el-tag> <el-tag v-else type="warning">未审批</el-tag>
@@ -298,27 +280,27 @@
<h4>领料单明细：{{ pickingListNumberShow }}</h4> <h4>领料单明细：{{ pickingListNumberShow }}</h4>
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300"> <el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" align="center" sortable prop="名称" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" align="center" sortable prop="图号或型号" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }} {{ scope.row.图号或型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="100"> <el-table-column label="规格" align="center" sortable prop="规格" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" min-width="100"> <el-table-column label="机床图号" align="center" sortable prop="机床图号" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="70"> <el-table-column label="组号" align="center" sortable prop="组号" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -338,13 +320,13 @@
{{ scope.row.出库数量1 }} {{ scope.row.出库数量1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100"> <el-table-column v-if="true" label="备料确认" align="center" sortable prop="是否备料确认" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag> <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag>
<el-tag v-else type="warning" size="mini">未备料</el-tag> <el-tag v-else type="warning" size="mini">未备料</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" width="100"> <el-table-column v-if="true" label="领料确认" align="center" sortable prop="是否领料确认" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag> <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
<el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag> <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>

12
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -32,32 +32,32 @@
</el-row> </el-row>
</div> </div>
<el-table :data="tableData1" stripe highlight-current-row border style="max-height: 500px;" height="500px" size="mini" show-summary> <el-table :data="tableData1" stripe highlight-current-row border style="max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="名称" align="center" width="150" show-overflow-tooltip> <el-table-column label="名称" sortable prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" width="100" show-overflow-tooltip> <el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" width="130" show-overflow-tooltip> <el-table-column label="规格" sortable prop="物料规格" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料来源" align="center" width="90"> <el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料来源 }} {{ scope.row.物料来源 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库" align="center" min-width="90"> <el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货位" align="center" min-width="90"> <el-table-column label="货位" sortable prop="货位名称" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位名称 }} {{ scope.row.货位名称 }}
</template> </template>

12
src/views/Inventory/MaterialOut/index.vue
View File

@@ -9,7 +9,7 @@
<h4 style="margin-top:0">领料单</h4> <h4 style="margin-top:0">领料单</h4>
<el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList"> <el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="领料单编号" align="center" min-width="200"> <el-table-column label="领料单编号" sortable prop="领料单编号" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
@@ -19,7 +19,7 @@
{{ scope.row.操作日期.split(' ')[0] }} {{ scope.row.操作日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料人" align="center" min-width="130"> <el-table-column label="领料人" sortable prop="姓名" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
@@ -62,22 +62,22 @@
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange"> <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/> <el-table-column type="selection" align="center" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" sortable prop="名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }} {{ scope.row.图号或型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="100"> <el-table-column label="规格" sortable prop="规格" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" min-width="100"> <el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>

8
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -15,22 +15,22 @@
<el-card> <el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord"> <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="120"> <el-table-column label="物料名称" sortable prop="物料名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料型号" align="center" min-width="120"> <el-table-column label="物料型号" sortable prop="物料型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" align="center" min-width="120"> <el-table-column label="物料规格" sortable prop="物料规格" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库名称" align="center" min-width="80"> <el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>

20
src/views/Inventory/OfflinePartsStorage/index.vue
View File

@@ -22,19 +22,19 @@
<el-card> <el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<el-table-column label="合同编号" width="120px" align="center" show-overflow-tooltip prop="合同编号"> <el-table-column label="合同编号" sortable prop="离线合同编号" width="120px" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称"> <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip> <el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 + '&nbsp;' + scope.row.物料型号 }} {{ scope.row.规格型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量"> <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
@@ -264,7 +264,17 @@ export default {
this.supplierName = '' this.supplierName = ''
this.contractNumber = '' this.contractNumber = ''
} }
this.table1 = res.data // this.table1 = res.data
res.data.map(v => {
this.table1.push({
离线合同编号: v.离线合同编号,
物料名称: v.物料名称,
规格型号: v.物料规格 + v.物料型号,
数量: v.数量,
到货数量: v.到货数量,
本次到货数量: v.本次到货数量
})
})
this.oldVal1 = '' this.oldVal1 = ''
}, },
// 多选 // 多选

20
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -50,17 +50,17 @@
</div> </div>
<h4 style="margin-top: 0">采购合同入库</h4> <h4 style="margin-top: 0">采购合同入库</h4>
<el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400"> <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" align="center" width="100" show-overflow-tooltip> <el-table-column label="名称" sortable prop="名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip> <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 }} {{ scope.row.图号或型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" width="120" show-overflow-tooltip> <el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
@@ -70,12 +70,12 @@
{{ scope.row.入库数量 }} {{ scope.row.入库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库人" align="center" width="100" show-overflow-tooltip> <el-table-column label="入库人" sortable prop="入库人" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库人 }} {{ scope.row.入库人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库时间" align="center" min-width="100"> <el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库时间 }} {{ scope.row.入库时间 }}
</template> </template>
@@ -94,17 +94,17 @@
</div> </div>
<h4>离线合同入库</h4> <h4>离线合同入库</h4>
<el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400"> <el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" align="center" width="120" show-overflow-tooltip> <el-table-column label="名称" sortable prop="名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip> <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 }} {{ scope.row.图号或型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" width="120" show-overflow-tooltip> <el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
@@ -114,12 +114,12 @@
{{ scope.row.入库数量 }} {{ scope.row.入库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库人" align="center" width="100"> <el-table-column label="入库人" sortable prop="入库人" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库人 }} {{ scope.row.入库人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库时间" align="center" min-width="100"> <el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库时间 }} {{ scope.row.入库时间 }}
</template> </template>

18
src/views/Inventory/PurchasePartsStorage/index.vue
View File

@@ -30,17 +30,17 @@
<el-card> <el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<el-table-column label="合同编号" width="120px" align="center" show-overflow-tooltip prop="合同编号"> <el-table-column label="合同编号" sortable prop="合同编号" width="120px" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同编号 }} {{ scope.row.合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称"> <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }} {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip> <el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }} {{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
</template> </template>
@@ -317,7 +317,17 @@ export default {
this.$set(v, '本次到货数量', v.数量 - v.到货数量) this.$set(v, '本次到货数量', v.数量 - v.到货数量)
return v return v
}) })
this.table1 = res.data // this.table1 = res.data
res.data.map(v => {
this.table1.push({
合同编号: v.合同编号,
物料名称: v.物料名称,
规格型号: v.物料规格 + v.物料型号,
数量: v.数量,
到货数量: v.到货数量,
本次到货数量: v.本次到货数量
})
})
} else if (this.TypeValue === 3) { } else if (this.TypeValue === 3) {
if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 } if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 }
const param = { const param = {

53
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -19,6 +19,17 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<<<<<<< HEAD
=======
<span>采购状态:</span>
<el-select v-model="purchaseStateValue" placeholder="采购状态" size="small">
<el-option
v-for="item in purchaseState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-button <el-button
type="success" type="success"
size="small" size="small"
@@ -77,11 +88,16 @@
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.changeSafeValue"> <template v-if="scope.row.changeSafeValue">
<el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/> <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
<<<<<<< HEAD
<el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button> <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button>
=======
<el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template> </template>
<span v-else>{{ scope.row.安全库存量 }}</span> <span v-else>{{ scope.row.安全库存量 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<<<<<<< HEAD
<el-table-column label="设置" min-width="70" align="center"> <el-table-column label="设置" min-width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
@@ -96,6 +112,8 @@
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
=======
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
@@ -114,7 +132,11 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span>采购明细表名称:</span> <span>采购明细表名称:</span>
<<<<<<< HEAD
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/> <el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
=======
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表号" size="small" clearable/>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-button <el-button
type="success" type="success"
size="small" size="small"
@@ -136,12 +158,15 @@
</div> </div>
<!-- --> <!-- -->
<el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2"> <el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
<<<<<<< HEAD
<el-table-column label="分配状态" align="center" min-width="170"> <el-table-column label="分配状态" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否分配)===0" type="warning" size="small">未分配</el-tag> <el-tag v-if="parseInt(scope.row.是否分配)===0" type="warning" size="small">未分配</el-tag>
<el-tag v-if="parseInt(scope.row.是否分配)===1" type="success" size="small">已分配</el-tag> <el-tag v-if="parseInt(scope.row.是否分配)===1" type="success" size="small">已分配</el-tag>
</template> </template>
</el-table-column> </el-table-column>
=======
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-table-column label="表单编号" align="center" min-width="170"> <el-table-column label="表单编号" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.表单编号 }} {{ scope.row.表单编号 }}
@@ -181,11 +206,18 @@
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
<h3>合同详细信息</h3> <h3>合同详细信息</h3>
<<<<<<< HEAD
<el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini"> <el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini">
<el-table-column label="序号" type="index" align="center" width="110"/> <el-table-column label="序号" type="index" align="center" width="110"/>
<el-table-column label="表单编号" align="center" width="110"> <el-table-column label="表单编号" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.表单编号 }} {{ scope.row.表单编号 }}
=======
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="表单编号" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" min-width="150"> <el-table-column label="物料名称" align="center" min-width="150">
@@ -205,17 +237,37 @@
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="100"> <el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<<<<<<< HEAD
<el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/> <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
=======
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
<b v-else>{{ scope.row.数量 }}</b>
</template>
</el-table-column>
<el-table-column label="单位" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注"> <el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope"> <template slot-scope="scope">
<<<<<<< HEAD
<el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/> <el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
=======
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
<b v-else>{{ scope.row.备注 || '—' }}</b>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100"> <el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<<<<<<< HEAD
<el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button> <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
=======
<el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
<b v-else>移除</b>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -333,6 +385,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
} }
}) })
<<<<<<< HEAD
}, },
cancelEdit1(row) { // 取消设置 cancelEdit1(row) { // 取消设置
row.安全库存量 = row.原安全库存量 row.安全库存量 = row.原安全库存量

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

@@ -13,27 +13,27 @@
</el-row> </el-row>
</div> </div>
<el-table :data="tableData1" stripe border height="700px" size="mini" show-summary> <el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
<el-table-column label="名称" align="center" width="130" show-overflow-tooltip> <el-table-column label="名称" sortable prop="物料名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" width="150" show-overflow-tooltip> <el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" width="200" show-overflow-tooltip> <el-table-column label="规格" sortable prop="物料规格" align="center" width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料来源" align="center" width="90"> <el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料来源 }} {{ scope.row.物料来源 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库" align="center" min-width="90"> <el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>

4
src/views/Outsourcing/OutsourcingQCSearch/index.vue
View File

@@ -8,12 +8,12 @@
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2"> <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
<el-table-column label="序号" align="center" width="55" type="index"/> <el-table-column label="序号" align="center" width="55" type="index"/>
<el-table-column label="外协到货单号" align="center" min-width="100"> <el-table-column label="外协到货单号" sortable prop="外协到货单编号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协到货单编号 }} {{ scope.row.外协到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协厂家" align="center" min-width="100"> <el-table-column label="外协厂家" sortable prop="外协厂家名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协厂家名称 }} {{ scope.row.外协厂家名称 }}
</template> </template>

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

@@ -31,7 +31,7 @@
height="400px" height="400px"
size="mini" size="mini"
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="采购合同编号" align="center" min-width="100"> <el-table-column label="采购合同编号" sortable prop="采购合同编号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
@@ -41,17 +41,17 @@
{{ scope.row.采购合同名称 }} {{ scope.row.采购合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交货日期" align="center" min-width="100"> <el-table-column label="交货日期" sortable prop="交货日期" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.交货日期 }} {{ scope.row.交货日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="150"> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" align="center" min-width="70"> <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>

16
src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
View File

@@ -14,22 +14,22 @@
</div> </div>
<h4 style="margin-top: 0">采购件列表</h4> <h4 style="margin-top: 0">采购件列表</h4>
<el-table :data="tableData1" size="mini" border style="width: 100%;" height="440"> <el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="150"> <el-table-column label="规格" sortable prop="物料规格" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column props="仓库名称" label="仓库名称" align="center" min-width="80"> <el-table-column props="仓库名称" sortable prop="仓库名称" label="仓库名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>
@@ -83,22 +83,22 @@
</div> </div>
<h4>滞货件列表</h4> <h4>滞货件列表</h4>
<el-table :data="tableData2" size="mini" border style="width: 100%;" height="440"> <el-table :data="tableData2" size="mini" border style="width: 100%;" height="440">
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="120" show-overflow-tooltip> <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="120" show-overflow-tooltip> <el-table-column label="规格" sortable prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库名称" align="center" min-width="80"> <el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>

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

@@ -34,7 +34,7 @@
<el-divider content-position="right"/> <el-divider content-position="right"/>
</div> </div>
</el-card> </el-card>
<el-row> <el-row id="PurchasingCenter/CreateInquirySheet">
<el-col :span="24"> <el-col :span="24">
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick"> <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购件" name="外购件"> <el-tab-pane label="外购件" name="外购件">
@@ -72,11 +72,29 @@
<span>物料变更:</span> <span>物料变更:</span>
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/> <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 15px">
<span>物料规格:</span> <span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/> <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span> <span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/> <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<span class="demonstration">开始时间: </span>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 200px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">结束时间:</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 200px"
type="date"
placeholder="选择日期"/>
<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="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-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"> <el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
@@ -90,7 +108,7 @@
</el-select> </el-select>
<el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button> <el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>
</div> </div>
<el-button slot="reference" type="warning" size="small" plain style="margin-left: 2px">调整采购任务</el-button> <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover> </el-popover>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
@@ -291,7 +309,7 @@
</el-select> </el-select>
<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button> <el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>
</div> </div>
<el-button slot="reference" type="warning" size="small" plain style="margin-left: 2px">调整采购任务</el-button> <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover> </el-popover>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
@@ -895,6 +913,8 @@ export default {
name: '', // 创建询价单 name: '', // 创建询价单
data() { data() {
return { return {
startTime: '',
endTime: '',
标准件和外购件流水号: [], 标准件和外购件流水号: [],
基本件流水号: [], 基本件流水号: [],
visible: false, visible: false,
@@ -1068,6 +1088,19 @@ export default {
'id' // 人员编号 'id' // 人员编号
]) ])
}, },
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'CreateInquirySheet') {
setTimeout(() => {
_this.Jump()
}, 1200)
}
}
}
},
created() { created() {
this.getPerson() this.getPerson()
this.fetchData() this.fetchData()
@@ -1077,7 +1110,15 @@ export default {
this.searchUnBuyPartNumber() this.searchUnBuyPartNumber()
this.initDirection() this.initDirection()
}, },
mounted() {
setTimeout(() => {
this.Jump()
}, 500)
},
methods: { methods: {
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
tiaozheng1() { tiaozheng1() {
if (this.标准件和外购件流水号.length !== 0) { if (this.标准件和外购件流水号.length !== 0) {
if (this.PersonValue) { if (this.PersonValue) {
@@ -1142,8 +1183,9 @@ export default {
}) })
}, },
clickCard1(project, machine) { clickCard1(project, machine) {
var hight = this.$refs.height1.offsetHeight window.location.hash = '#PurchasingCenter/CreateInquirySheet'
document.documentElement.scrollTop = hight + 140 // var hight = this.$refs.height1.offsetHeight
// document.documentElement.scrollTop = hight + 140
this.projectValue = project this.projectValue = project
this.machine = [] this.machine = []
this.machineValue = '' this.machineValue = ''
@@ -1164,8 +1206,9 @@ export default {
}) })
}, },
clickCard2(project, machine) { clickCard2(project, machine) {
var hight = this.$refs.height1.offsetHeight window.location.hash = '#PurchasingCenter/CreateInquirySheet'
document.documentElement.scrollTop = hight + 140 // var hight = this.$refs.height1.offsetHeight
// document.documentElement.scrollTop = hight + 140
this.projectValue = project this.projectValue = project
this.machine = [] this.machine = []
this.machineValue = '' this.machineValue = ''
@@ -1465,14 +1508,15 @@ export default {
return row['供货商'].trim() === value return row['供货商'].trim() === value
}, },
searchTable11() { // 查询外购件列表 searchTable11() { // 查询外购件列表
let check1, check2, check3, check4, check5, check6 let check1, check2, check3, check4, check5, check6, check7
this.materialName ? check1 = 1 : check1 = 0 this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0 this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0 this.materialModel ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0 this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0 this.groupValue ? check6 = 1 : check6 = 0
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).then(response => { this.startTime && this.endTime ? check7 = 1 : check7 = 0
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, this.endTime).then(response => {
this.tableData11 = response.data.rows this.tableData11 = response.data.rows
this.total11 = response.data.total this.total11 = response.data.total
const remark = [] const remark = []

8
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -41,12 +41,12 @@
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号" align="center" min-width="90"> <el-table-column label="发票号" sortable prop="发票号" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票号 }} {{ scope.row.发票号 }}
</template> </template>
@@ -56,12 +56,12 @@
{{ scope.row.发票金额 }} {{ scope.row.发票金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请人" align="center" min-width="60"> <el-table-column label="申请人" sortable prop="申请人姓名" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" min-width="115" show-overflow-tooltip> <el-table-column label="申请时间" sortable prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }} {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template> </template>

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

@@ -48,29 +48,29 @@
size="mini" size="mini"
@selection-change="handleSelectionChange1"> @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/> <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column label="物料状态" align="center" width="80"> <el-table-column label="物料状态" sortable prop="询价状态编号" align="center" width="100">
<template slot-scope="scope"> <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.询价状态编号)===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.询价状态编号)===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> <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商"> <el-table-column :filters="supplierFilters" :filter-method="filterHandler" sortable prop="供货商" label="供货商" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务分配时间" align="center" min-width="100"> <el-table-column label="任务分配时间" sortable prop="任务分配时间" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }} {{ scope.row.任务分配时间.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" min-width="100"> <el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="80"> <el-table-column label="组号" sortable prop="组号" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -80,22 +80,22 @@
{{ scope.row.物料类别 }} {{ scope.row.物料类别 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料品种" align="center" min-width="100"> <el-table-column label="物料品种" sortable prop="物料品种" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料品种 }} {{ scope.row.物料品种 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" min-width="100" show-overflow-tooltip> <el-table-column label="名称" align="center" sortable prop="物料名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="200" show-overflow-tooltip> <el-table-column label="规格" align="center" sortable prop="物料规格" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
@@ -302,7 +302,7 @@
<el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag> <el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="离线合同编号" align="center" min-width="170"> <el-table-column label="离线合同编号" sortable prop="离线合同编号" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
</template> </template>
@@ -312,17 +312,17 @@
{{ scope.row.离线合同名称 }} {{ scope.row.离线合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" align="center" min-width="80"> <el-table-column label="采购员" sortable prop="采购员" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购员 }} {{ scope.row.采购员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建日期" align="center" width="100"> <el-table-column label="创建日期" sortable prop="创建日期" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }} {{ scope.row.创建日期.split(' ')[0] }}
</template> </template>

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

@@ -33,17 +33,17 @@
</div> </div>
<h3 style="margin-top: 0">请款表</h3> <h3 style="margin-top: 0">请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe> <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款时间" align="center" min-width="150"> <el-table-column label="请款时间" sortable prop="。请款时间" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款时间 }} {{ scope.row.请款时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款人" align="center" min-width="80"> <el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>

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

@@ -54,7 +54,7 @@
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同号" align="center" min-width="100"> <el-table-column label="采购合同号" sortable prop="采购合同编号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
@@ -64,32 +64,32 @@
{{ scope.row.采购合同名称 }} {{ scope.row.采购合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="150"> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" align="center" min-width="60"> <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合同总额" align="center" min-width="70" fixed="right"> <el-table-column label="合同总额" sortable prop="合同金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同总额 }} {{ scope.row.合同总额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70" fixed="right"> <el-table-column label="欠款金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }} {{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已付金额" align="center" min-width="70" fixed="right"> <el-table-column label="已付金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.已付金额).toFixed(2) }} {{ Number(scope.row.已付金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款进度" align="center" min-width="150" fixed="right"> <el-table-column label="付款进度" sortable prop="付款进度" align="center" min-width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-progress <el-progress
:text-inside="true" :text-inside="true"
@@ -162,7 +162,23 @@ export default {
this.contractNumValue ? this.check1 = 1 : this.check1 = 0 this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => { searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
this.tableData1 = response.data.rows // this.tableData1 = response.data.rows
response.data.rows.map(v => {
this.tableData1.push({
交货日期: v.交货日期,
支付日期: v.支付日期,
支付方式: v.支付方式,
开票信息: v.开票信息,
其他说明: v.其他说明,
采购合同编号: v.采购合同编号,
采购合同名称: v.采购合同名称,
供应商名称: v.供应商名称,
姓名: v.姓名,
合同总额: v.合同总额,
欠款金额: v.欠款金额,
已付金额: v.已付金额
})
})
console.log(response.data.rows) console.log(response.data.rows)
this.total1 = response.data.total this.total1 = response.data.total
}) })

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

@@ -19,7 +19,7 @@
</div> </div>
<h3>付款计划</h3> <h3>付款计划</h3>
<el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract"> <el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract">
<el-table-column label="计划状态" width="100" align="center"> <el-table-column label="计划状态" sortable prop="计划付款日期" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="timeToStamp(scope.row.计划付款日期) <= getDate" type="danger" size="small">已拖期</el-tag> <el-tag v-if="timeToStamp(scope.row.计划付款日期) <= getDate" type="danger" size="small">已拖期</el-tag>
<el-tag v-if="timeToStamp(scope.row.计划付款日期) > getDate" type="success" size="small">未拖期</el-tag> <el-tag v-if="timeToStamp(scope.row.计划付款日期) > getDate" type="success" size="small">未拖期</el-tag>
@@ -40,17 +40,17 @@
{{ scope.row.计划付款备注 }} {{ scope.row.计划付款备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同编号" min-width="100" align="center" show-overflow-tooltip> <el-table-column label="采购合同编号" sortable prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同名称" min-width="100" align="center"> <el-table-column label="采购合同名称" sortable prop="采购合同名称" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同名称 }} {{ scope.row.采购合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" min-width="150" align="center"> <el-table-column label="供应商" sortable prop="供应商名称" min-width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -86,17 +86,17 @@
</div> </div>
<h3>请款表</h3> <h3>请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe> <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款时间" align="center" min-width="150"> <el-table-column label="请款时间" sortable prop="请款时间" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款时间 }} {{ scope.row.请款时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款人" align="center" min-width="80"> <el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>

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

@@ -110,7 +110,7 @@
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" width="150" show-overflow-tooltip> <el-table-column label="供应商" sortable prop="供应商名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -120,19 +120,19 @@
{{ scope.row.采购合同名称 }} {{ scope.row.采购合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同号" align="center" min-width="160"> <el-table-column label="采购合同号" sortable prop="采购合同编号" align="center" min-width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核情况" align="center" min-width="80"> <el-table-column label="审核情况" sortable prop="审核情况内容" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag> <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>
<el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag> <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>
<el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag> <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批情况" align="center" min-width="80"> <el-table-column label="审批情况" sortable prop="审批情况内容" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag> <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>
<el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag> <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>
@@ -166,7 +166,7 @@
<span v-else>—</span> <span v-else>—</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" align="center" min-width="60"> <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>

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

@@ -39,7 +39,7 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()"> <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件"> <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" style="max-height: 600px" height="600px" border stripe>
<el-table-column align="center" label="采购情况" width="80px"> <el-table-column align="center" sortable prop="询价状态编号" label="采购状态" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -47,17 +47,17 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="80px"> <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" sortable prop="物料名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
@@ -67,12 +67,12 @@
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip> <el-table-column align="center" label="规格" sortable prop="物料规格" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -97,7 +97,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip> <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="150px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template> </template>
@@ -127,7 +127,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="外购件" name="外购件"> <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" style="max-height: 600px" height="600px" border stripe>
<el-table-column align="center" label="采购情况" width="80px"> <el-table-column align="center" label="采购状态" sortable prop="询价状态编号" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -135,17 +135,17 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="80px"> <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" sortable prop="物料名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
@@ -155,12 +155,12 @@
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip> <el-table-column align="center" label="规格" sortable prop="物料规格" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -185,7 +185,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip> <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="150px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template> </template>
@@ -215,7 +215,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="基本件" name="基本件"> <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" style="max-height: 600px" height="600px" border stripe>
<el-table-column align="center" label="采购情况" width="80px"> <el-table-column align="center" label="采购状态" sortable prop="询价状态编号" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -223,17 +223,17 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="80px"> <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" sortable prop="物料名称" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -243,7 +243,7 @@
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="规格" sortable prop="规格" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
@@ -253,7 +253,7 @@
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -278,7 +278,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供应商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
</template> </template>

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

@@ -137,7 +137,7 @@
<el-row style="margin-bottom: 10px"> <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" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection"/> <el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" label="采购情况" sortable prop="询价状态编号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -145,12 +145,12 @@
<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" min-width="100px"> <el-table-column align="center" label="项目名称" sortable prop="项目名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
@@ -160,27 +160,27 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料类别" min-width="100px"> <el-table-column align="center" sortable prop="物料类别" label="物料类别" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料类别 }} {{ scope.row.物料类别 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料品种" min-width="100px"> <el-table-column align="center" sortable prop="物料品种" label="物料品种" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料品种 }} {{ scope.row.物料品种 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号或型号" min-width="100px"> <el-table-column align="center" sortable prop="物料型号" label="图号或型号" min-width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="100px"> <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
@@ -195,7 +195,7 @@
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px"> <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
@@ -354,7 +354,7 @@
<el-row style="margin-bottom: 10px"> <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" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection"/> <el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" sortable prop="询价状态编号" label="采购情况" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -362,12 +362,12 @@
<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" min-width="100px"> <el-table-column align="center" sortable prop="项目名称" label="项目名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
@@ -377,27 +377,27 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料类别" min-width="100px"> <el-table-column align="center" sortable prop="物料类别" label="物料类别" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料类别 }} {{ scope.row.物料类别 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料品种" min-width="100px"> <el-table-column align="center" label="物料品种" sortable prop="物料品种" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料品种 }} {{ scope.row.物料品种 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号或型号" min-width="100px"> <el-table-column align="center" sortable prop="物料型号" label="图号或型号" min-width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="100px"> <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
@@ -412,7 +412,7 @@
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px"> <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
@@ -545,7 +545,7 @@
<el-row style="margin-bottom: 10px"> <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" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection"/> <el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" label="采购情况" min-width="80px"> <el-table-column align="center" sortable prop="询价状态编号" label="采购情况" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag> <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.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -553,32 +553,32 @@
<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" min-width="100px"> <el-table-column align="center" sortable prop="项目名称" label="项目名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" min-width="100px"> <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" min-width="80px"> <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" min-width="100px"> <el-table-column align="center" sortable prop="零件图号" label="图号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" min-width="100px"> <el-table-column align="center" sortable prop="零件名称" label="名称" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" min-width="100px"> <el-table-column align="center" sortable prop="规格" label="规格" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
@@ -598,7 +598,7 @@
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" min-width="100px"> <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>

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

@@ -70,17 +70,17 @@
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同编号" align="center" min-width="100"> <el-table-column label="采购合同编号" sortable prop="采购合同编号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同名称" align="center" min-width="100"> <el-table-column label="采购合同名称" sortable prop="采购合同名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同名称 }} {{ scope.row.采购合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>