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-12-03 18:01:28 +08:00
parent 490d6d008d
commit 266a82f423
3 changed files with 126 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -992,6 +992,7 @@ export default {
this.form.付款方式 = parseInt(row.付款方式代码) this.form.付款方式 = parseInt(row.付款方式代码)
this.biddingNumber = row.招标保证金流水号 this.biddingNumber = row.招标保证金流水号
this.form.bidding = row.招标企业 this.form.bidding = row.招标企业
this.form.contractAmount = row.合同总金额
this.disabled = true this.disabled = true
this.temp = 2 this.temp = 2
this.isTrue = false this.isTrue = false

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

@@ -16,22 +16,22 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-divider content-position="right"/> <!--<el-divider content-position="right"/>-->
<el-divider content-position="right"> <!--<el-divider content-position="right">-->
<el-button type="text" @click="searchUnBuyPartNumber">刷新</el-button> | 待采购零件数 <!--<el-button type="text" @click="searchUnBuyPartNumber">刷新</el-button> | 待采购零件数-->
</el-divider> <!--</el-divider>-->
<el-row> <!--<el-row>-->
<el-col v-for="(machine,index) in machines2" :key="index" style="width: 200px"> <!--<el-col v-for="(machine,index) in machines2" :key="index" style="width: 200px">-->
<el-card shadow="hover" class="sudoku_item" style="height:80px;width: 90%" @click.native="clickCard2(machine.项目流水号, machine.机床流水号)"> <!--<el-card shadow="hover" class="sudoku_item" style="height:80px;width: 90%" @click.native="clickCard2(machine.项目流水号, machine.机床流水号)">-->
<el-badge :value="machine.未采购零件数"> <!--<el-badge :value="machine.未采购零件数">-->
<div style="width: 100px;height:50px;margin:0" class="sudoku_item"> <!--<div style="width: 100px;height:50px;margin:0" class="sudoku_item">-->
{{ machine.机床图号 }} <!--{{ machine.机床图号 }}-->
</div> <!--</div>-->
</el-badge> <!--</el-badge>-->
</el-card> <!--</el-card>-->
</el-col> <!--</el-col>-->
</el-row> <!--</el-row>-->
<el-divider content-position="right"/> <!--<el-divider content-position="right"/>-->
</div> </div>
</el-card> </el-card>
<el-row id="PurchasingCenter/CreateInquirySheet"> <el-row id="PurchasingCenter/CreateInquirySheet">
@@ -46,7 +46,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/> <el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable> <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option <el-option
v-for="item in machine" v-for="item in machine"
@@ -63,9 +63,11 @@
<!--</el-select>--> <!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>--> <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>--> <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="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-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 50px"/> <el-tooltip :open-delay="1000" effect="dark" content="开启物料变更" placement="top">
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
</el-tooltip>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
size="small" size="small"
@@ -78,14 +80,19 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="timeChange1()"/> @change="timeChange1()"/>
<el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng1()">调整采购任务</el-button> <el-popover v-model="visible1" placement="top" width="140">
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable> <div style="text-align: right; margin: 0">
<el-option <el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
v-for="item in Person" <el-option
:key="item.value" v-for="item in Person"
:label="item.label" :key="item.value"
:value="item.value"/> :label="item.label"
</el-select> :value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="visible1 = false;tiaozheng1()">确定</el-button>
</div>
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">--> <!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">--> <!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>--> <!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
@@ -1443,7 +1450,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号 ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 询价状态编号 = 1 and 采购状态编号 = 1 and 零件类型 = 2 where 询价状态编号 = 1 and 采购状态编号 = 1
and 人员编号 = ${this.id} and 人员编号 = ${this.id}
group by 项目流水号,机床流水号,机床图号,人员编号 group by 项目流水号,机床流水号,机床图号,人员编号
union all union all
@@ -1715,7 +1722,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0 this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => { searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).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 = []
@@ -1754,7 +1761,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0 this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '') this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => { searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows this.tableData12 = response.data.rows
this.total12 = response.data.total this.total12 = response.data.total
const remark = [] const remark = []
@@ -1789,7 +1796,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0 this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '') this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => { searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows this.tableData12 = response.data.rows
this.total12 = response.data.total this.total12 = response.data.total
const remark = [] const remark = []

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

@@ -29,7 +29,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/> <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()"/>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange"> <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
@@ -84,7 +84,9 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
<div style="float:right;"> <div style="float:right;">
<span style="margin-left: 0">采购员:</span> <span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -113,7 +115,7 @@
</div> </div>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData0" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1"> <el-table v-loading="loading" :data="tableData0" size="mini" height="800px" 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="采购情况" prop="询价状态编号" min-width="100px"> <el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -183,27 +185,27 @@
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}--> <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" label="计划到货时间" min-width="100px"> <!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<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 align="center" label="生产分配时间" min-width="100px"> <!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<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 :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名"> <el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
<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 align="center" label="采购分配时间" min-width="100px"> <!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }} <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right"> <el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
<el-button <el-button
@@ -220,7 +222,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent0" :current-page="pageCurrent0"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize0" :page-size="pageSize0"
:total="total0" :total="total0"
style="display:inline-block;width:50%" style="display:inline-block;width:50%"
@@ -238,7 +240,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/> <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()"/>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable> <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
<el-option <el-option
v-for="item in machine" v-for="item in machine"
@@ -280,7 +282,9 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>
<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>
<div style="float:right;"> <div style="float:right;">
<span style="margin-left: 0">采购员:</span> <span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -295,7 +299,7 @@
</div> </div>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData1" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1"> <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" 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" prop="询价状态编号" label="采购情况" min-width="100px"> <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -365,27 +369,27 @@
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}--> <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" label="计划到货时间" min-width="100px"> <!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<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 align="center" label="生产分配时间" min-width="100px"> <!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<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 :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名"> <el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
<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 align="center" label="采购分配时间" min-width="100px"> <!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }} <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right"> <el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')" :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
@@ -400,7 +404,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize1" :page-size="pageSize1"
:total="total1" :total="total1"
style="display:inline-block;width:50%" style="display:inline-block;width:50%"
@@ -418,7 +422,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/> <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()"/>
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable> <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
<el-option <el-option
v-for="item in machine" v-for="item in machine"
@@ -437,7 +441,9 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>--> <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>
<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>
<div style="float:right"> <div style="float:right">
<span style="margin-left: 0">采购员:</span> <span style="margin-left: 0">采购员:</span>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -452,7 +458,7 @@
</div> </div>
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
<el-table v-loading="" :data="tableData2" size="mini" height="800px" border stripe @selection-change="handleSelectionChange2"> <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" 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" prop="询价状态编号" label="采购情况" min-width="80px"> <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -512,27 +518,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" label="计划到货时间" min-width="100px">-->
<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 align="center" label="生产分配时间" min-width="100px"> <!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<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 :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer"> <el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
<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 align="center" label="采购分配时间" min-width="100px"> <!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }} <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right"> <el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')" :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
@@ -547,7 +553,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent2" :current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize2" :page-size="pageSize2"
:total="total2" :total="total2"
style="display:inline-block;width:50%" style="display:inline-block;width:50%"
@@ -605,8 +611,10 @@ export default {
} }
}] }]
}, },
loading: false,
dateRange: '', dateRange: '',
timer2: '', timer2: '',
radio: '1',
machines: [], machines: [],
source: [ source: [
{ {
@@ -636,7 +644,6 @@ export default {
groupValue: '', groupValue: '',
group: [], group: [],
materialName: '', materialName: '',
materialStatusValue: [0], // 物料状态
materialStatus: [ materialStatus: [
{ {
value: 0, value: 0,
@@ -679,13 +686,13 @@ export default {
groupAndPart: [], groupAndPart: [],
groupAndPartBasic: [], groupAndPartBasic: [],
pageCurrent0: 1, pageCurrent0: 1,
pageSize0: 20, pageSize0: 50,
total0: 0, total0: 0,
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 20, pageSize1: 50,
total1: 0, total1: 0,
pageCurrent2: 1, pageCurrent2: 1,
pageSize2: 20, pageSize2: 50,
total2: 0 total2: 0
} }
}, },
@@ -752,7 +759,6 @@ export default {
}) })
} }
this.machineValue = machine this.machineValue = machine
this.materialStatusValue = [1]
this.searchTable0() this.searchTable0()
this.searchTable1() this.searchTable1()
this.searchTable2() this.searchTable2()
@@ -796,6 +802,7 @@ export default {
}) })
}, },
fetchData() { // 初始化 fetchData() { // 初始化
console.log(this.radio, 222)
initProject().then(response => { initProject().then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.project.push({ this.project.push({
@@ -850,6 +857,7 @@ export default {
} }
}, },
searchTable0() { // 查询标准件 searchTable0() { // 查询标准件
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0 this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0 this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0 this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -860,12 +868,14 @@ export default {
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.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '') // this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => { searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows this.tableData0 = response.data.rows
this.total0 = response.data.total this.total0 = response.data.total
this.loading = false
}) })
}, },
searchTable1() { // 查询外购件 searchTable1() { // 查询外购件
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0 this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0 this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0 this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -875,12 +885,14 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0 this.materialName ? this.check4 = 1 : this.check4 = 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
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => { searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.total1 = response.data.total this.total1 = response.data.total
this.loading = false
}) })
}, },
searchTable2() { // 查询基本件 searchTable2() { // 查询基本件
this.loading = true
this.projectValue ? this.check3 = 1 : this.check3 = 0 this.projectValue ? this.check3 = 1 : this.check3 = 0
let check1, check2, check3, check4, check5, check6 let check1, check2, check3, check4, check5, check6
this.partNum ? check1 = 1 : check1 = 0 this.partNum ? check1 = 1 : check1 = 0
@@ -889,9 +901,10 @@ export default {
this.partMaterial ? check4 = 1 : check4 = 0 this.partMaterial ? 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
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => { searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
this.loading = false
}) })
}, },
handleSelectionChange1(val) { // 标准件和外购件多选 handleSelectionChange1(val) { // 标准件和外购件多选
@@ -1086,6 +1099,9 @@ export default {
width:150px; width:150px;
margin-right: 10px; margin-right: 10px;
} }
.el-radio{
margin-right: 0px;
}
</style> </style>
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
.item { .item {