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

View File

@@ -16,22 +16,22 @@
</el-card>
</el-col>
</el-row>
<el-divider content-position="right"/>
<el-divider content-position="right">
<el-button type="text" @click="searchUnBuyPartNumber">刷新</el-button> | 待采购零件数
</el-divider>
<el-row>
<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-badge :value="machine.未采购零件数">
<div style="width: 100px;height:50px;margin:0" class="sudoku_item">
{{ machine.机床图号 }}
</div>
</el-badge>
</el-card>
</el-col>
</el-row>
<el-divider content-position="right"/>
<!--<el-divider content-position="right"/>-->
<!--<el-divider content-position="right">-->
<!--<el-button type="text" @click="searchUnBuyPartNumber">刷新</el-button> | 待采购零件数-->
<!--</el-divider>-->
<!--<el-row>-->
<!--<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-badge :value="machine.未采购零件数">-->
<!--<div style="width: 100px;height:50px;margin:0" class="sudoku_item">-->
<!--{{ machine.机床图号 }}-->
<!--</div>-->
<!--</el-badge>-->
<!--</el-card>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-divider content-position="right"/>-->
</div>
</el-card>
<el-row id="PurchasingCenter/CreateInquirySheet">
@@ -46,7 +46,7 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</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-option
v-for="item in machine"
@@ -63,9 +63,11 @@
<!--</el-select>-->
<!--<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-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-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
v-model="startTime"
size="small"
@@ -78,14 +80,19 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="timeChange1()"/>
<el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng1()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-popover v-model="visible1" placement="top" width="140">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="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">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
@@ -1443,7 +1450,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 询价状态编号 = 1 and 采购状态编号 = 1 and 零件类型 = 2
where 询价状态编号 = 1 and 采购状态编号 = 1
and 人员编号 = ${this.id}
group by 项目流水号,机床流水号,机床图号,人员编号
union all
@@ -1715,7 +1722,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
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.total11 = response.data.total
const remark = []
@@ -1754,7 +1761,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
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.total12 = response.data.total
const remark = []
@@ -1789,7 +1796,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
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.total12 = response.data.total
const remark = []