Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
liushuai
@@ -3,35 +3,28 @@
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<el-row style="margin-bottom:-10px!important;">
|
||||
<span>物料名称:</span>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
|
||||
<span>物料规格:</span>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
|
||||
<span>物料型号:</span>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
|
||||
<span>仓库名称:</span>
|
||||
<el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
|
||||
<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
|
||||
<el-option
|
||||
v-for="item in inventoryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>货位名称:</span>
|
||||
<el-select v-model="locateNameValue" style="margin-top: 10px;" size="small" clearable>
|
||||
<el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in locateName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
|
||||
</el-row>
|
||||
</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 height="550px" style="width: 850px" size="mini">
|
||||
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
@@ -47,22 +40,22 @@
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
|
||||
<el-table-column label="物料来源" prop="物料来源" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料来源 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.仓库名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位" prop="货位名称" align="center" min-width="90">
|
||||
<!-- <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.仓库名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="货位" prop="货位名称" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位存量" align="center" width="150" prop="货位存量">
|
||||
<el-table-column label="货位存量" align="center" width="180" prop="货位存量">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.changeValue">
|
||||
<el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
|
||||
@@ -105,7 +98,7 @@
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 80px">
|
||||
<el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=10;searchMaterial01()">查询</el-button>
|
||||
<el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-table :data="tableData01" border stripe highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">
|
||||
@@ -193,7 +186,7 @@ export default {
|
||||
locateName: [],
|
||||
tableData1: [],
|
||||
pageCurrent: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
total: 0,
|
||||
dialogVisible: false,
|
||||
tableData01: [],
|
||||
|
||||
@@ -9,103 +9,104 @@
|
||||
<el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right" @click="inputPassword()">领料确认</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<div style="width: 26%;float: left;margin-right: 16px">
|
||||
<div style="width: 27%;float: left;margin-right: 16px">
|
||||
<el-card>
|
||||
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="730px" @row-click="clickList">
|
||||
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
|
||||
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
|
||||
<el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
|
||||
<el-table-column label="领料人" prop="领料人" show-overflow-tooltip align="center" min-width="60px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="备注" align="center" min-width="130px">
|
||||
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:left;margin: 10px 0;">
|
||||
<div class="block" style="float:left;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent3"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize3"
|
||||
:total="total3"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
layout="total"
|
||||
@size-change="handleSizeChange3"
|
||||
@current-change="handleCurrentChange3"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
<div style="width: 72.5%;float: left">
|
||||
<div style="width: 70%;float: left">
|
||||
<el-card>
|
||||
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="780">
|
||||
<el-table-column label="名称" prop="名称" align="center" min-width="100">
|
||||
<el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 100%;" size="mini" height="570" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="45"/>
|
||||
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="90" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号或型号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格" align="center" min-width="200" show-overflow-tooltip>
|
||||
<el-table-column label="规格" prop="规格" align="center" min-width="130" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领用" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出库" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备件" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库存" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位存量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已领" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.出库数量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="true" label="备料" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备</el-tag>
|
||||
<el-tag v-else type="warning" size="mini">未备</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column v-if="true" label="领料" align="center" width="60">-->
|
||||
<!-- <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-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.出库数量1) === 0" type="warning" size="mini">未领</el-tag>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="70">
|
||||
<el-table-column label="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领用数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备件数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库存数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位存量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已领数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.出库数量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出库数" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1)" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="true" label="备料确认" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</el-tag>
|
||||
<el-tag v-else type="warning" size="mini">未备料</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="true" label="领料确认" align="center" width="90">
|
||||
<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-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.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
@@ -237,6 +238,7 @@ export default {
|
||||
name: 'MaterialOut',
|
||||
data() {
|
||||
return {
|
||||
multipleSelection1: [],
|
||||
multipleSelection: [],
|
||||
pickingListNum: '', // 领料单流水号
|
||||
pickingPersonNum: '', // 领料人流水号
|
||||
@@ -244,7 +246,7 @@ export default {
|
||||
pickingListNumberShow: '',
|
||||
pickListTable1: [],
|
||||
pageCurrent3: 1,
|
||||
pageSize3: 40,
|
||||
pageSize3: 10000,
|
||||
total3: 0,
|
||||
pickListTable2: [],
|
||||
StockNumberTable: [],
|
||||
@@ -430,6 +432,8 @@ export default {
|
||||
},
|
||||
// 领料确认
|
||||
inputPassword() {
|
||||
this.form3.outTypeValue = ''
|
||||
this.form3.password = ''
|
||||
this.dialogFormVisible3 = true
|
||||
},
|
||||
selectable(row, index) { // 控制某行是否可选
|
||||
@@ -518,16 +522,27 @@ export default {
|
||||
})
|
||||
},
|
||||
tableRowClassName({ row }) {
|
||||
if (parseInt(row.是否审批) === 1) {
|
||||
if (parseInt(row.是否审批) === 0) {
|
||||
return 'shenpi-row'
|
||||
} else {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
tableRowClassName1({ row }) {
|
||||
if (parseInt(row.出库数量1) === 0) {
|
||||
return 'weilingliao-row'
|
||||
} else if (parseInt(row.总数量) > parseInt(row.出库数量1) && parseInt(row.出库数量1)) {
|
||||
return 'weilingwan-row'
|
||||
} else {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
// 多选
|
||||
handleSelectionChange(val) {
|
||||
console.log(val)
|
||||
this.SELECTION = val
|
||||
this.multipleSelection1 = []
|
||||
val.map(v => {
|
||||
this.multipleSelection1.push(v.领料单明细流水号)
|
||||
})
|
||||
},
|
||||
// 提交领料确认
|
||||
pickConfirm1() {
|
||||
@@ -602,4 +617,10 @@ export default {
|
||||
.el-table .shenpi-row {
|
||||
background: #9BD7FC !important;
|
||||
}
|
||||
.el-table .weilingliao-row {
|
||||
background: #D8DDE6 !important;
|
||||
}
|
||||
.el-table .weilingwan-row {
|
||||
background: #E9F0F9 !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<span>供应商：</span>
|
||||
<el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px" @change="supplierChange();searchContractDetail()">
|
||||
<!-- <span>供应商：</span>-->
|
||||
<el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px;margin: 0px 10px" @change="supplierChange();searchContractDetail()">
|
||||
<el-option
|
||||
v-for="item in supplier"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 5px">合同：</span>
|
||||
<el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 180px" @change="searchContractDetail()">
|
||||
<!-- <span style="margin-left: 5px">合同：</span>-->
|
||||
<el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 140px;margin: 0px 10px" @change="searchContractDetail()">
|
||||
<el-option
|
||||
v-for="item in contract"
|
||||
:key="item.value"
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
</el-select>
|
||||
<el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/>
|
||||
<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />
|
||||
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />
|
||||
</el-row>
|
||||
<el-row style="margin-bottom:10px">
|
||||
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;width:150px" />
|
||||
<el-date-picker
|
||||
v-model="inTime"
|
||||
type="daterange"
|
||||
@@ -31,7 +31,7 @@
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="~"
|
||||
style="width:250px;margin-left: 10px"
|
||||
style="width:250px;margin-left: 0px"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
</el-select>
|
||||
<el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" />
|
||||
<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />
|
||||
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />
|
||||
</el-row>
|
||||
<el-row style="margin-bottom:10px">
|
||||
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px" />
|
||||
<el-date-picker
|
||||
v-model="outTime"
|
||||
type="daterange"
|
||||
@@ -31,7 +31,7 @@
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="~"
|
||||
style="width:250px;margin-left: 10px"
|
||||
style="width:250px;margin-left: 0px"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<span>供应商：</span>
|
||||
<el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px" @change="supplierChange();searchContractDetail()">
|
||||
<!-- <span>供应商：</span>-->
|
||||
<el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px;margin: 0px 10px;" @change="supplierChange();searchContractDetail()">
|
||||
<el-option
|
||||
v-for="item in supplier"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 5px">合同：</span>
|
||||
<el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 180px" @change="searchContractDetail()">
|
||||
<!-- <span style="margin-left: 5px">合同：</span>-->
|
||||
<el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 140px;margin: 0px 10px;" @change="searchContractDetail()">
|
||||
<el-option
|
||||
v-for="item in contract"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 5px">合同类型：</span>
|
||||
<el-select v-model="TypeValue" filterable size="small" placeholder="合同类型" style="width: 180px" @change="contractTypeChange">
|
||||
<!-- <span style="margin-left: 5px">合同类型：</span>-->
|
||||
<el-select v-model="TypeValue" filterable size="small" placeholder="合同类型" style="width: 140px;margin: 0px 10px;" @change="contractTypeChange">
|
||||
<el-option
|
||||
v-for="item in Type"
|
||||
:key="item.value"
|
||||
@@ -72,7 +72,7 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="primary" style="margin-left: 5px" size="small" @click="submitInStorage">确认入库</el-button>
|
||||
<el-button type="primary" style="margin: 10px" size="small" @click="submitInStorage">确认入库</el-button>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -3,47 +3,59 @@
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<el-row style="margin-bottom:-10px!important;">
|
||||
<span>物料名称:</span>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
|
||||
<span>物料规格:</span>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
|
||||
<span>物料型号:</span>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
|
||||
<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
|
||||
<el-option
|
||||
v-for="item in inventoryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in locateName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
|
||||
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
|
||||
</el-row>
|
||||
</div>
|
||||
<el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
|
||||
<el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>
|
||||
<el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 710px" size="mini">
|
||||
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>
|
||||
<el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
|
||||
<el-table-column label="物料来源" prop="物料来源" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料来源 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.仓库名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位" align="center" min-width="90">
|
||||
<!-- <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.仓库名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="货位" prop="货位名称" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位存量" align="center" width="150" prop="货位存量">
|
||||
<el-table-column label="货位存量" align="center" width="80" prop="货位存量">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.changeValue">
|
||||
<el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
|
||||
@@ -52,6 +64,12 @@
|
||||
<span v-else>{{ scope.row.货位存量 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="操作" align="center" width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>-->
|
||||
<!-- <el-button v-else type="primary" icon="el-icon-edit" size="mini" plain @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
@@ -64,6 +82,92 @@
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<!-- <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">-->
|
||||
<!-- <el-row>-->
|
||||
<!-- <el-col style="width: 240px">-->
|
||||
<!-- <span>物料名称:</span>-->
|
||||
<!-- <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 240px">-->
|
||||
<!-- <span>物料规格:</span>-->
|
||||
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 240px">-->
|
||||
<!-- <span>物料型号:</span>-->
|
||||
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 80px">-->
|
||||
<!-- <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- <el-table :data="tableData01" border stripe highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">-->
|
||||
<!-- <el-table-column label="名称" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="图号或型号" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料型号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="规格" align="center" min-width="200">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料规格 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="供货商" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.供货商 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- <div class="block" style="margin: 10px 0">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="pageCurrent01"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
|
||||
<!-- :page-size="pageSize01"-->
|
||||
<!-- :total="total01"-->
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
||||
<!-- @size-change="handleSizeChange01"-->
|
||||
<!-- @current-change="handleCurrentChange01"/>-->
|
||||
<!-- </div><hr>-->
|
||||
<!-- <el-row>-->
|
||||
<!-- <el-col style="width: 210px">-->
|
||||
<!-- <span>仓库:</span>-->
|
||||
<!-- <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in inventoryName"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- :value="item.value"/>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 210px">-->
|
||||
<!-- <span>货位:</span>-->
|
||||
<!-- <el-select v-model="locateNameValue" style="margin-bottom: 10px;" size="small" clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in locateName"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- :value="item.value"/>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 210px">-->
|
||||
<!-- <span>货位存量:</span>-->
|
||||
<!-- <el-input-number v-model="localNumber" :min="0" :precision="2" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col style="width: 180px">-->
|
||||
<!-- <span>是否为滞货:</span>-->
|
||||
<!-- <el-checkbox v-model="isBacklog" size="small" label="滞货件" border style="border: 1px solid rgb(49,56,72)"/>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- <div slot="footer" class="dialog-footer">-->
|
||||
<!-- <el-button size="small" @click="dialogVisible=false">取消</el-button>-->
|
||||
<!-- <el-button type="primary" size="small" @click="submitAdd">确定</el-button>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-dialog>-->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -76,10 +180,22 @@ export default {
|
||||
materialName: '',
|
||||
materialSpec: '',
|
||||
materialModel: '',
|
||||
inventoryNameValue: '',
|
||||
inventoryName: [],
|
||||
locateNameValue: '',
|
||||
locateName: [],
|
||||
tableData1: [],
|
||||
pageCurrent: 1,
|
||||
pageSize: 10,
|
||||
total: 0
|
||||
pageSize: 20,
|
||||
total: 0,
|
||||
dialogVisible: false,
|
||||
tableData01: [],
|
||||
pageCurrent01: 1,
|
||||
pageSize01: 10,
|
||||
total01: 0,
|
||||
localNumber: '',
|
||||
materialValue: '',
|
||||
isBacklog: false
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -88,23 +204,66 @@ export default {
|
||||
])
|
||||
},
|
||||
mounted() {
|
||||
this.initData()
|
||||
this.searchMaterial()
|
||||
},
|
||||
methods: {
|
||||
// 初始化数据
|
||||
initData() {
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '库存管理_货位主文件_仓库查询'
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
for (let i = 0; i < res.data.length; i++) {
|
||||
this.inventoryName.push({
|
||||
label: res.data[i].仓库名称,
|
||||
value: res.data[i].仓库流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 根据仓库查货位
|
||||
getLocate() {
|
||||
this.locateName = []
|
||||
this.locateNameValue = ''
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '库存管理_货位主文件_查询数据',
|
||||
param: `仓库流水号=${this.inventoryNameValue}`
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
for (let i = 0; i < res.data.length; i++) {
|
||||
this.locateName.push({
|
||||
label: res.data[i].货位名称,
|
||||
value: res.data[i].货位流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 根据条件查物料货位数量
|
||||
searchMaterial() {
|
||||
// this.$router.push('/ManufacturingCenter/StatusQuery')
|
||||
let check1, check2, check3
|
||||
let check1, check2, check3, check4, check5
|
||||
this.materialName ? check1 = 1 : check1 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
this.materialModel ? check3 = 1 : check3 = 0
|
||||
this.inventoryNameValue ? check4 = 1 : check4 = 0
|
||||
this.locateNameValue ? check5 = 1 : check5 = 0
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: `库存管理_库存盘点_物料货位数量_查询数据`,
|
||||
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${0}&仓库流水号=${0}&货位流水号_check=${0}&货位流水号=${0}`,
|
||||
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
|
||||
Pagination: this.pageCurrent + '&' + this.pageSize
|
||||
}
|
||||
}
|
||||
@@ -127,6 +286,91 @@ export default {
|
||||
handleCurrentChange(val) {
|
||||
this.pageCurrent = val
|
||||
this.searchMaterial()
|
||||
},
|
||||
// 取消设置
|
||||
cancelEdit(row) {
|
||||
row.货位存量 = row.原货位存量
|
||||
row.changeValue = false
|
||||
this.$message('取消修改')
|
||||
},
|
||||
// 确认设置
|
||||
confirmEdit(row) {
|
||||
Number(row.货位存量) ? row.货位存量 = Number(row.货位存量) : row.货位存量 = 0
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: `库存管理_库存盘点_物料货位数量_修改数据`,
|
||||
param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}`
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
if (res.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
row.changeValue = false
|
||||
} else {
|
||||
this.$message.error('操作失败')
|
||||
}
|
||||
})
|
||||
},
|
||||
// 新增物料货位数量
|
||||
addMaterial() {
|
||||
this.dialogVisible = true
|
||||
},
|
||||
// 选择物料
|
||||
selectMaterial(row) {
|
||||
this.materialValue = row.物料流水号
|
||||
},
|
||||
// 确认新增物料货位数量
|
||||
submitAdd() {
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: `库存管理_库存盘点_物料货位数量_增加数据`,
|
||||
param: `物料流水号=${this.materialValue}&货位流水号=${this.locateNameValue}&货位存量=${this.localNumber}&是否为滞货=${Number(this.isBacklog)}`
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
if (res.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.dialogVisible = false
|
||||
} else {
|
||||
this.$message.error('操作失败')
|
||||
}
|
||||
})
|
||||
},
|
||||
// 查物料
|
||||
searchMaterial01() {
|
||||
let check1, check2, check3
|
||||
this.materialName ? check1 = 1 : check1 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
this.materialModel ? check3 = 1 : check3 = 0
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: `库存管理_物料主文件_基本_查询数据_分页`,
|
||||
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&PageCurrent=${this.pageCurrent01}=int&PageSize=${this.pageSize01}=int&PageCount=1=int=output&ItemCount=1=int=output`
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
this.tableData01 = res.data.result
|
||||
this.total01 = Number(res.data.output[0].ItemCount)
|
||||
})
|
||||
},
|
||||
// 分页
|
||||
handleSizeChange01(val) {
|
||||
this.pageSize01 = val
|
||||
this.pageCurrent01 = 1
|
||||
this.searchMaterial01()
|
||||
},
|
||||
handleCurrentChange01(val) {
|
||||
this.pageCurrent01 = val
|
||||
this.searchMaterial01()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -140,3 +384,146 @@ export default {
|
||||
width:165px
|
||||
}
|
||||
</style>
|
||||
|
||||
<!--<template>-->
|
||||
<!-- <div class="app-container">-->
|
||||
<!-- <el-card>-->
|
||||
<!-- <div slot="header">-->
|
||||
<!-- <el-row style="margin-bottom:-10px!important;">-->
|
||||
<!-- <span>物料名称:</span>-->
|
||||
<!-- <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
|
||||
<!-- <span>物料规格:</span>-->
|
||||
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
|
||||
<!-- <span>物料型号:</span>-->
|
||||
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
|
||||
<!-- <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </div>-->
|
||||
<!-- <el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>-->
|
||||
<!-- <el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料型号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料规格 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="物料来源" prop="物料来源" align="center" width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.物料来源 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.仓库名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="货位" align="center" min-width="90">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.货位名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="货位存量" align="center" width="150" prop="货位存量">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <template v-if="scope.row.changeValue">-->
|
||||
<!-- <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>-->
|
||||
<!-- <el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- <span v-else>{{ scope.row.货位存量 }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- <div class="block" style="margin-top: 10px;">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="pageCurrent"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
|
||||
<!-- :page-size="pageSize"-->
|
||||
<!-- :total="total"-->
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
||||
<!-- @size-change="handleSizeChange"-->
|
||||
<!-- @current-change="handleCurrentChange"/>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-card>-->
|
||||
<!-- </div>-->
|
||||
<!--</template>-->
|
||||
|
||||
<!--<script>-->
|
||||
<!--import { mapGetters } from 'vuex'-->
|
||||
<!--import request from '@/utils/request'-->
|
||||
<!--export default {-->
|
||||
<!-- data() {-->
|
||||
<!-- return {-->
|
||||
<!-- materialName: '',-->
|
||||
<!-- materialSpec: '',-->
|
||||
<!-- materialModel: '',-->
|
||||
<!-- tableData1: [],-->
|
||||
<!-- pageCurrent: 1,-->
|
||||
<!-- pageSize: 10,-->
|
||||
<!-- total: 0-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- computed: {-->
|
||||
<!-- ...mapGetters([-->
|
||||
<!-- 'id' // 人员编号-->
|
||||
<!-- ])-->
|
||||
<!-- },-->
|
||||
<!-- mounted() {-->
|
||||
<!-- this.searchMaterial()-->
|
||||
<!-- },-->
|
||||
<!-- methods: {-->
|
||||
<!-- // 根据条件查物料货位数量-->
|
||||
<!-- searchMaterial() {-->
|
||||
<!-- // this.$router.push('/ManufacturingCenter/StatusQuery')-->
|
||||
<!-- let check1, check2, check3-->
|
||||
<!-- this.materialName ? check1 = 1 : check1 = 0-->
|
||||
<!-- this.materialSpec ? check2 = 1 : check2 = 0-->
|
||||
<!-- this.materialModel ? check3 = 1 : check3 = 0-->
|
||||
<!-- const param = {-->
|
||||
<!-- url: '',-->
|
||||
<!-- method: 'post',-->
|
||||
<!-- data: {-->
|
||||
<!-- type: '1',-->
|
||||
<!-- name: `库存管理_库存盘点_物料货位数量_查询数据`,-->
|
||||
<!-- param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${0}&仓库流水号=${0}&货位流水号_check=${0}&货位流水号=${0}`,-->
|
||||
<!-- Pagination: this.pageCurrent + '&' + this.pageSize-->
|
||||
<!-- }-->
|
||||
<!-- }-->
|
||||
<!-- request(param).then(res => {-->
|
||||
<!-- this.tableData1 = res.data.rows-->
|
||||
<!-- this.tableData1.map(v => {-->
|
||||
<!-- this.$set(v, 'changeValue', false)-->
|
||||
<!-- v.原货位存量 = v.货位存量-->
|
||||
<!-- return v-->
|
||||
<!-- })-->
|
||||
<!-- this.total = res.data.total-->
|
||||
<!-- })-->
|
||||
<!-- },-->
|
||||
<!-- // 分页-->
|
||||
<!-- handleSizeChange(val) {-->
|
||||
<!-- this.pageSize = val-->
|
||||
<!-- this.pageCurrent = 1-->
|
||||
<!-- this.searchMaterial()-->
|
||||
<!-- },-->
|
||||
<!-- handleCurrentChange(val) {-->
|
||||
<!-- this.pageCurrent = val-->
|
||||
<!-- this.searchMaterial()-->
|
||||
<!-- }-->
|
||||
<!-- }-->
|
||||
<!--}-->
|
||||
<!--</script>-->
|
||||
|
||||
<!--<style scoped>-->
|
||||
<!-- .el-select{-->
|
||||
<!-- width:165px-->
|
||||
<!-- }-->
|
||||
<!-- .el-input{-->
|
||||
<!-- width:165px-->
|
||||
<!-- }-->
|
||||
<!--</style>-->
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
{{ scope.row.零件号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="零件名称" label="零件名称" width="130">
|
||||
<el-table-column align="center" prop="零件名称" label="零件名称" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
@@ -271,49 +271,53 @@ export default {
|
||||
}
|
||||
},
|
||||
getTable() { // 获取主表
|
||||
this.loading0 = true
|
||||
this.tableData = []
|
||||
if (this.radio === 2) { // 全部
|
||||
getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
|
||||
this.total = response.data.total
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
|
||||
response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
|
||||
response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
|
||||
}
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData.push({
|
||||
零件号: response.data.rows[i].零件图号,
|
||||
零件名称: response.data.rows[i].零件名称,
|
||||
工艺开始时间: response.data.rows[i].工艺计划开始时间,
|
||||
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
||||
数量: response.data.rows[i].批次数量,
|
||||
投产时间: response.data.rows[i].操作时间,
|
||||
工艺员: '',
|
||||
人员编号: '',
|
||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||
})
|
||||
}
|
||||
this.loading0 = false
|
||||
})
|
||||
} else { // 当天
|
||||
getTable00(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
|
||||
this.total = response.data.total
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData.push({
|
||||
零件号: response.data.rows[i].零件图号,
|
||||
零件名称: response.data.rows[i].零件名称,
|
||||
工艺开始时间: response.data.rows[i].工艺计划开始时间,
|
||||
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
||||
数量: response.data.rows[i].批次数量,
|
||||
投产时间: response.data.rows[i].操作时间,
|
||||
工艺员: '',
|
||||
人员编号: '',
|
||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||
})
|
||||
}
|
||||
this.loading0 = false
|
||||
})
|
||||
if (this.GroupNumValue === null) {
|
||||
this.tableData = []
|
||||
} else {
|
||||
this.loading0 = true
|
||||
this.tableData = []
|
||||
if (this.radio === 2) { // 全部
|
||||
getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
|
||||
this.total = response.data.total
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
|
||||
response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
|
||||
response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
|
||||
}
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData.push({
|
||||
零件号: response.data.rows[i].零件图号,
|
||||
零件名称: response.data.rows[i].零件名称,
|
||||
工艺开始时间: response.data.rows[i].工艺计划开始时间,
|
||||
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
||||
数量: response.data.rows[i].批次数量,
|
||||
投产时间: response.data.rows[i].操作时间,
|
||||
工艺员: '',
|
||||
人员编号: '',
|
||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||
})
|
||||
}
|
||||
this.loading0 = false
|
||||
})
|
||||
} else { // 当天
|
||||
getTable00(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
|
||||
this.total = response.data.total
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData.push({
|
||||
零件号: response.data.rows[i].零件图号,
|
||||
零件名称: response.data.rows[i].零件名称,
|
||||
工艺开始时间: response.data.rows[i].工艺计划开始时间,
|
||||
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
||||
数量: response.data.rows[i].批次数量,
|
||||
投产时间: response.data.rows[i].操作时间,
|
||||
工艺员: '',
|
||||
人员编号: '',
|
||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||
})
|
||||
}
|
||||
this.loading0 = false
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">
|
||||
<el-option
|
||||
v-for="item in project"
|
||||
:key="item.value"
|
||||
@@ -53,20 +53,20 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
|
||||
<el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>
|
||||
<el-option
|
||||
v-for="item in group"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" style="width:120px" clearable/>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>
|
||||
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
|
||||
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>-->
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
@@ -111,40 +111,34 @@
|
||||
<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料状态" align="center" width="80">
|
||||
<el-table-column label="状态" align="center" width="70">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="approval(scope.row)" type="primary" size="small">审批中</el-tag>
|
||||
<el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>
|
||||
<span v-if="unInquiry(scope.row)" style="color: orange">未询价</span>
|
||||
<span v-if="inquiry(scope.row)" style="color: blue">已询价</span>
|
||||
<span v-if="approval(scope.row)" style="color: green">审批中</span>
|
||||
<span v-if="purchased(scope.row)">已采购</span>
|
||||
<!-- <el-tag v-if="unInquiry(scope.row)" type="warning" size="mini">未询价</el-tag>-->
|
||||
<!-- <el-tag v-if="inquiry(scope.row)" type="success" size="mini">已询价</el-tag>-->
|
||||
<!-- <el-tag v-if="approval(scope.row)" type="primary" size="mini">审批中</el-tag>-->
|
||||
<!-- <el-tag v-if="purchased(scope.row)" type="info" size="mini">已采购</el-tag>-->
|
||||
</template>
|
||||
</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" label="供货商" align="center" min-width="100" prop="供货商" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="项目名称" align="center" min-width="100">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.项目名称 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="机床图号" align="center" min-width="100" prop="机床图号">
|
||||
<el-table-column label="机床图号" align="center" min-width="130" prop="机床图号" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="80">
|
||||
<el-table-column label="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
@@ -159,37 +153,37 @@
|
||||
<!--{{ scope.row.物料品种 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="名称" align="center" min-width="100" prop="名称">
|
||||
<el-table-column label="名称" align="center" width="100" prop="名称">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="120" prop="物料型号">
|
||||
<el-table-column label="图号或型号" align="center" min-width="130" prop="物料型号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="150" prop="物料规格">
|
||||
<el-table-column label="规格" align="center" min-width="100" prop="物料规格" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分配数量" align="center" min-width="80">
|
||||
<el-table-column label="分配数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="待询价数量" align="center" min-width="90">
|
||||
<el-table-column label="待询价数" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库存数" align="center" min-width="90">
|
||||
<el-table-column label="库存数" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.货位存量) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="使用滞货数量" align="center" min-width="100">
|
||||
<el-table-column label="已用滞货" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.使用滞货数量) }}
|
||||
</template>
|
||||
@@ -207,16 +201,26 @@
|
||||
<!--</el-tooltip>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可用滞货数量" align="center" min-width="100">
|
||||
<el-table-column label="可用滞货" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.滞货数量) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
|
||||
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分配时间" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价单编号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b>
|
||||
@@ -244,7 +248,7 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="基本件" name="基本件">
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 100px" filterable clearable @change="projectChange">
|
||||
<el-option
|
||||
v-for="item in project"
|
||||
:key="item.value"
|
||||
@@ -258,19 +262,19 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
|
||||
<el-select v-model="groupValue" placeholder="组号" size="small" style="width: 100px" clearable filterable>
|
||||
<el-option
|
||||
v-for="item in group"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
|
||||
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
|
||||
<el-input v-model="partName" placeholder="零件名称" size="small" style="width: 120px" clearable/>
|
||||
<el-input v-model="partSpec" placeholder="零件规格" size="small" style="width: 120px" clearable/>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
|
||||
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
size="small"
|
||||
@@ -315,7 +319,7 @@
|
||||
<!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="partChange(scope.row)">零件变更</el-button>-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="零件状态" align="center" width="100">
|
||||
<el-table-column label="采购状态" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
|
||||
@@ -328,52 +332,42 @@
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<!-- <el-table-column label="项目名称" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.项目名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="机床图号" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="80">
|
||||
<el-table-column label="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号" align="center" min-width="100">
|
||||
<el-table-column label="图号" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<el-table-column label="名称" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<el-table-column label="规格" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" min-width="100">
|
||||
<el-table-column label="材料" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" min-width="80">
|
||||
<el-table-column label="数量" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件数量 }}
|
||||
</template>
|
||||
@@ -383,6 +377,16 @@
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分配时间" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价单编号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b>
|
||||
@@ -588,170 +592,183 @@
|
||||
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<span>询价单号:</span>
|
||||
<el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/>
|
||||
<span>供应商:</span>
|
||||
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
|
||||
<!-- <span>询价单号:</span>-->
|
||||
<el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" style="margin: 0px 10px" clearable/>
|
||||
<!-- <span>供应商:</span>-->
|
||||
<el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
|
||||
<el-button
|
||||
type="success"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
style="margin-left: 10px"
|
||||
@click="createInquirySheet">创建询价单</el-button>
|
||||
style="margin:0px 10px"
|
||||
@click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
|
||||
<el-button
|
||||
type="warning"
|
||||
size="small"
|
||||
style="margin-left: 10px"
|
||||
style="margin: 0px 20px"
|
||||
@click="addInquirySheet">选入物料</el-button>
|
||||
</el-tooltip>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
style="float: right;margin:0px 10px"
|
||||
@click="createInquirySheet">创建询价单</el-button>
|
||||
</div>
|
||||
<h3 style="margin-top: 0;display:inline-block;width:50%">询价单</h3>
|
||||
<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" @click="inquirySheetBaseInfoMaintain">询价单基础信息维护</el-button>
|
||||
<el-table v-loading="" :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table-column label="询价单编号" align="center" width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.询价单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="电话" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.电话号码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="传真" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.传真 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="受托人" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.注册资本 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="帐号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.帐号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="开户行" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.开户行 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="税号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.税号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="法人" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.企业性质 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="邮编" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="200" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="warning" size="mini" plain icon="el-icon-edit" @click="editInquirySheet(scope.row)">编辑</el-button>
|
||||
<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="deleteInquirySheet(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin: 10px 0;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent2"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize2"
|
||||
:total="total2"
|
||||
style="display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange2"
|
||||
@current-change="handleCurrentChange2"/>
|
||||
<el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="printInquirySheet()">打印</el-button>
|
||||
<el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
|
||||
<el-card>
|
||||
<h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3>
|
||||
<el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
|
||||
<el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
|
||||
<!-- <h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
|
||||
<el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="margin-left:300px" @click="printInquirySheet()">打印</el-button>
|
||||
<el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px" @click="exportInquirySheet()">导出</el-button>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top">
|
||||
<el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
|
||||
<el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
|
||||
</el-tooltip>
|
||||
</div><hr>
|
||||
<h3 style="margin-top: 0">询价单明细</h3>
|
||||
<el-table v-loading="" :data="tableData3" border style="max-height: 500px;" height="500px" size="mini">
|
||||
<el-table-column label="供应商" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料型号 : scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="待询价数量" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.技术下达数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际询价(采购)数量" align="center" width="130">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width:100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价备注" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width:100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价单编号" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.询价单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 || scope.row.基本件机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 || scope.row.基本件组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="100" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中删除" placement="top">
|
||||
<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" plain @click="inquirySheetBaseInfoMaintain">信息维护</el-button>
|
||||
</el-card>
|
||||
<el-row>
|
||||
<el-col style="width:310px">
|
||||
<el-card style="width:310px">
|
||||
<el-table v-loading="" :data="tableData2" border style="width:320px;float: left;margin-right: 20px" height="500px" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table-column label="询价单编号" align="center" width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.询价单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商" align="center" width="180" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="电话" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.电话号码 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="传真" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.传真 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="受托人" align="center" min-width="70">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.注册资本 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="帐号" align="center" min-width="100" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.帐号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="开户行" align="center" min-width="100" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.开户行 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="税号" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.税号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="法人" align="center" min-width="70">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.企业性质 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="邮编" align="center" min-width="70">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.货期 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="操作" align="center" width="200" fixed="right">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <!– <el-button type="warning" size="mini" plain icon="el-icon-edit" @click="editInquirySheet(scope.row)">编辑</el-button>–>-->
|
||||
<!-- <!– <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="deleteInquirySheet()">删除</el-button>–>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<!-- <div class="block" style="margin: 10px 0;">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="pageCurrent2"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40]"-->
|
||||
<!-- :page-size="pageSize2"-->
|
||||
<!-- :total="total2"-->
|
||||
<!-- layout="total"-->
|
||||
<!-- @size-change="handleSizeChange2"-->
|
||||
<!-- @current-change="handleCurrentChange2"/>-->
|
||||
<!-- </div>-->
|
||||
<el-col style="width:880px">
|
||||
<el-card>
|
||||
<el-table v-loading="" :data="tableData3" border style="max-height: 500px;width: 850px;float: left" height="500px" size="mini" >
|
||||
<!-- <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.供应商名称 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="图号" align="center" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料型号 : scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" width="110" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="待询数" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.技术下达数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实询数" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width:100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价备注" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width:100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="询价单编号" align="center" min-width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.询价单编号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="机床图号" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 || scope.row.基本件机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 || scope.row.基本件组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中删除" placement="top">
|
||||
<el-button type="text" size="mini" icon="el-icon-delete" @click="outInquirySheet(scope.row)"/>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<div id="inquirySheet" style="width: 1000px;margin: 0 auto;display:none">
|
||||
@@ -1132,10 +1149,10 @@ export default {
|
||||
value: 0,
|
||||
label: '全部'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '未分配'
|
||||
},
|
||||
// {
|
||||
// value: 1,
|
||||
// label: '未分配'
|
||||
// },
|
||||
{
|
||||
value: 2,
|
||||
label: '已分配',
|
||||
@@ -1178,7 +1195,7 @@ export default {
|
||||
tableData2: [], // 询价单列表
|
||||
total2: 0,
|
||||
pageCurrent2: 1,
|
||||
pageSize2: 10,
|
||||
pageSize2: 10000,
|
||||
tableData3: [], // 询价单明细
|
||||
dialogVisible1: false,
|
||||
inquirySheetNum: '', // 询价单号
|
||||
@@ -1248,7 +1265,8 @@ export default {
|
||||
backlogMaterialNum: '',
|
||||
cancelNum: 0,
|
||||
machines1: [],
|
||||
machines2: []
|
||||
machines2: [],
|
||||
row1: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -1876,41 +1894,52 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
deleteInquirySheet(row) { // 删除询价单
|
||||
this.$confirm('确定删除该询价单?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
deleteInquirySheet(row.询价单流水号).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('删除成功')
|
||||
this.inquirySheetNum = ''
|
||||
this.supplierName = ''
|
||||
this.supplierValue = ''
|
||||
this.searchTable2()
|
||||
this.tableData3 = []
|
||||
this.searchTable11()
|
||||
this.searchTable12()
|
||||
} else { this.$message.error('删除失败') }
|
||||
deleteInquirySheet() { // 删除询价单
|
||||
if (this.row1 === '') {
|
||||
console.log(this.row1, 1)
|
||||
this.$message.error('请选择询价单')
|
||||
} else {
|
||||
console.log(this.row1, 2)
|
||||
this.$confirm('确定删除该询价单?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
deleteInquirySheet(this.row1.询价单流水号).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('删除成功')
|
||||
this.inquirySheetNum = ''
|
||||
this.supplierName = ''
|
||||
this.supplierValue = ''
|
||||
this.searchTable2()
|
||||
this.tableData3 = []
|
||||
this.searchTable11()
|
||||
this.searchTable12()
|
||||
} else { this.$message.error('删除失败') }
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
},
|
||||
editInquirySheet(row) { // 编辑询价单
|
||||
if (this.$refs['form2'] !== undefined) {
|
||||
this.$refs['form2'].resetFields()
|
||||
}
|
||||
this.title2 = '编辑询价单'
|
||||
this.form2.inquirySheetNumValue = row.询价单流水号
|
||||
this.form2.inquirySheetNum = row.询价单编号
|
||||
this.form2.supplierValue = row.供应商流水号
|
||||
this.form2.supplierName = row.供应商名称
|
||||
this.dialogVisible2 = true
|
||||
},
|
||||
editInquirySheet() { // 编辑询价单
|
||||
if (this.row1 === '') {
|
||||
console.log(this.row1)
|
||||
this.$message.error('请选择询价单')
|
||||
} else {
|
||||
if (this.$refs['form2'] !== undefined) {
|
||||
this.$refs['form2'].resetFields()
|
||||
}
|
||||
this.title2 = '编辑询价单'
|
||||
this.form2.inquirySheetNumValue = this.row1.询价单流水号
|
||||
this.form2.inquirySheetNum = this.row1.询价单编号
|
||||
this.form2.supplierValue = this.row1.供应商流水号
|
||||
this.form2.supplierName = this.row1.供应商名称
|
||||
this.dialogVisible2 = true
|
||||
}
|
||||
},
|
||||
submitEditInquirySheet() { // 提交编辑询价单
|
||||
this.$refs['form2'].validate((valid) => {
|
||||
@@ -1926,7 +1955,7 @@ export default {
|
||||
if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
|
||||
this.$message.error('该询价单号已存在')
|
||||
} else {
|
||||
editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
|
||||
editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierNameValue).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('修改成功')
|
||||
this.inquirySheetNum = ''
|
||||
@@ -2211,6 +2240,7 @@ export default {
|
||||
this.dialogVisible1 = false
|
||||
},
|
||||
searchTable3(row) { // 查询该询价单中的物料和零件
|
||||
this.row1 = row
|
||||
this.tableData3 = []
|
||||
this.inquirySheetFlowNum = row.询价单流水号
|
||||
this.orderExport = row.询价单编号
|
||||
|
||||
@@ -41,85 +41,62 @@
|
||||
</el-row>
|
||||
<el-row style="margin-top: 10px">
|
||||
<!--<span>交货日期:</span>-->
|
||||
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" placeholder="交货日期" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<!--<span>开票信息:</span>-->
|
||||
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" placeholder="开票日期" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<!--<span>支付 日期:</span>-->
|
||||
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" placeholder="支付日期" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<!--<span>支付方式:</span>-->
|
||||
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" placeholder="支付方式" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<!--<span>其他说明:</span>-->
|
||||
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/>
|
||||
<el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
|
||||
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
|
||||
</el-row>
|
||||
|
||||
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
|
||||
<el-table-column label="序号" align="center" width="50" type="index"/>
|
||||
<el-table-column label="交货期" align="center" width="170">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-if="quickChangePrice"
|
||||
v-model="scope.row.交货期"
|
||||
size="mini"
|
||||
type="date"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"/>
|
||||
<b v-else>{{ scope.row.交货期.split(' ')[0] || '—' }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" width="70">
|
||||
<el-table-column label="组号" align="center" width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<el-table-column label="名称" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="100">
|
||||
<el-table-column label="图号或型号" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号 ? scope.row.图号 : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="150">
|
||||
<el-table-column label="规格" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 ? scope.row.规格 : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" width="80">
|
||||
<el-table-column label="数量" align="center" width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="70">
|
||||
<el-table-column label="单位" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%" @keyup.native="scope.row.未税单价 = scope.row.未税单价.replace(/[^\.\d]/g,'')" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
|
||||
<b v-show="hasTax!=='未税'">—</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
|
||||
<el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:100%" @keyup.native="scope.row.含税单价 = scope.row.含税单价.replace(/[^\.\d]/g,'')" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
|
||||
<b v-show="hasTax!=='含税'">—</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总额（未税）" align="center" min-width="100" prop="未税总额">
|
||||
<template slot-scope="scope">
|
||||
{{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总额（含税）" align="center" min-width="100" prop="含税总额">
|
||||
<template slot-scope="scope">
|
||||
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.含税单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
|
||||
@@ -131,6 +108,30 @@
|
||||
<b v-else>{{ scope.row.备注 || '—' }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-if="quickChangePrice"
|
||||
v-model="scope.row.交货期"
|
||||
size="mini"
|
||||
type="date"
|
||||
style="width: 130px"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"/>
|
||||
<b v-else>{{ scope.row.交货期.split(' ')[0] || '—' }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%" @keyup.native="scope.row.未税单价 = scope.row.未税单价.replace(/[^\.\d]/g,'')" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
|
||||
<b v-show="hasTax!=='未税'">—</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总额（未税）" align="center" min-width="100" prop="未税总额">
|
||||
<template slot-scope="scope">
|
||||
{{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-tooltip v-show="false" :open-delay="1000" content="一键删除交货期" placement="right">
|
||||
<el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
|
||||
|
||||
@@ -29,10 +29,10 @@
|
||||
<el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
|
||||
<el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
|
||||
<el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px; margin: 0px 10px"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>物料状态:</span>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px"/>
|
||||
<!-- <span>物料状态:</span>-->
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
@@ -41,18 +41,18 @@
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
style="width:250px;margin-left: 10px"
|
||||
style="width:250px;margin-left: 0px"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button
|
||||
type="success"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
style="margin:10px 10px 0px 10px"
|
||||
@click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
|
||||
<el-popover v-model="visible1" title="调整采购任务" placement="top" width="180">
|
||||
<el-popover v-model="visible1" placement="top" width="140">
|
||||
<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:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
@@ -69,45 +69,39 @@
|
||||
:data="tableData00"
|
||||
:row-class-name="tableRowClassName"
|
||||
border
|
||||
show-summary
|
||||
style="width: 100%;max-height: 500px;"
|
||||
height="500px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1">
|
||||
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
|
||||
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
|
||||
<el-table-column label="采购状态" prop="询价状态编号" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
|
||||
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
|
||||
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" prop="组号" align="center" min-width="80">
|
||||
<el-table-column label="组号" prop="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料类别" align="center" min-width="100">
|
||||
<el-table-column label="物料类别" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料类别 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
|
||||
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料品种 }}
|
||||
</template>
|
||||
@@ -117,22 +111,22 @@
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" prop="物料规格" min-width="170" show-overflow-tooltip>
|
||||
<el-table-column label="规格" align="center" prop="物料规格" min-width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
|
||||
<el-table-column label="分配数量" align="center" min-width="70" prop="零件数量">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库存" align="center" min-width="100" prop="库存">
|
||||
<el-table-column label="库存" align="center" min-width="50" prop="库存">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) }}
|
||||
</template>
|
||||
@@ -142,7 +136,7 @@
|
||||
<el-input-number v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > Number(scope.row.货位存量) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量)) : Number(scope.row.零件数量)" :disabled="Number(scope.row.货位存量) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="待采购数量" align="center" min-width="100" prop="待采购数量">
|
||||
<el-table-column label="待采数量" align="center" min-width="70" prop="待采购数量">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) }}
|
||||
</template>
|
||||
@@ -152,11 +146,16 @@
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
|
||||
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="来源" min-width="60px" prop="零件类型筛选">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin: 10px 0 0 0;">
|
||||
<el-pagination
|
||||
@@ -196,10 +195,10 @@
|
||||
<el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
|
||||
<el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
|
||||
<el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px; margin: 0px 10px"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>物料状态:</span>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px"/>
|
||||
<!-- <span>物料状态:</span>-->
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
@@ -208,7 +207,7 @@
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
style="width:250px;margin-left: 10px"
|
||||
style="width:250px;margin: 10px 10px 0px 0px"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button
|
||||
@@ -217,9 +216,9 @@
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
|
||||
<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
|
||||
<el-popover v-model="visible" placement="top" width="140">
|
||||
<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:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
@@ -236,45 +235,39 @@
|
||||
:data="tableData00"
|
||||
:row-class-name="tableRowClassName"
|
||||
border
|
||||
show-summary
|
||||
style="width: 100%;max-height: 500px;"
|
||||
height="500px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1">
|
||||
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
|
||||
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
|
||||
<el-table-column label="物料状态" prop="询价状态编号" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
|
||||
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
|
||||
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" prop="组号" align="center" min-width="80">
|
||||
<el-table-column label="组号" prop="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料类别" align="center" min-width="100">
|
||||
<el-table-column label="物料类别" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料类别 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
|
||||
<el-table-column label="物料品种" prop="物料品种" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料品种 }}
|
||||
</template>
|
||||
@@ -284,17 +277,17 @@
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
|
||||
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
|
||||
<el-table-column label="规格" align="center" prop="物料规格" min-width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
|
||||
<el-table-column label="分配数量" align="center" min-width="70" prop="零件数量">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件数量 }}
|
||||
</template>
|
||||
@@ -317,7 +310,7 @@
|
||||
{{ Number(scope.row.滞货数量) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
|
||||
<el-table-column label="待采购数" align="center" min-width="70" prop="待采购数量">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
|
||||
</template>
|
||||
@@ -332,6 +325,11 @@
|
||||
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="110">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin: 10px 0 0 0;">
|
||||
<el-pagination
|
||||
@@ -371,10 +369,10 @@
|
||||
<el-input v-model="partNum" style="width: 120px;margin-left: 10px" placeholder="零件图号" size="small" clearable/>
|
||||
<el-input v-model="partName" style="width: 120px;margin-left: 10px" placeholder="零件名称" size="small" clearable/>
|
||||
<el-input v-model="partSpec" style="width: 120px;margin-left: 10px" placeholder="零件规格" size="small" clearable/>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin: 0px 10px"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span style="margin-right: -10px">物料状态:</span>
|
||||
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin-left: 10px"/>
|
||||
<!-- <span style="margin-right: -10px">物料状态:</span>-->
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
@@ -383,13 +381,13 @@
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
style="width:250px;margin-left: 10px"
|
||||
style="width:250px;margi: 10px 10px 0px 0px"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
|
||||
<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
|
||||
<el-popover v-model="visible2" placement="top" width="140">
|
||||
<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:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
@@ -412,64 +410,54 @@
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1">
|
||||
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
|
||||
<el-table-column label="零件状态" align="center" width="100">
|
||||
<el-table-column label="零件状态" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
|
||||
</template>
|
||||
</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" label="供货商" align="center" min-width="120" prop="供货商" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="100">
|
||||
<el-table-column label="项目名称" align="center" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<el-table-column label="机床图号" align="center" min-width="80" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="80">
|
||||
<el-table-column label="组号" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号" align="center" min-width="100">
|
||||
<el-table-column label="图号" align="center" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<el-table-column label="名称" align="center" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<el-table-column label="规格" align="center" min-width="80" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" min-width="100">
|
||||
<el-table-column label="材料" align="center" min-width="80" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" min-width="80">
|
||||
<el-table-column label="数量" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.待采购数量 }}
|
||||
</template>
|
||||
@@ -479,6 +467,16 @@
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设计者" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务分配时间" align="center" min-width="110">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-row>
|
||||
<div class="block">
|
||||
@@ -594,16 +592,16 @@
|
||||
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<span>离线合同号:</span>
|
||||
<el-input v-model="offlineContract" placeholder="离线合同号" size="small" clearable/>
|
||||
<span>供应商:</span>
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
|
||||
<!-- <span>离线合同号:</span>-->
|
||||
<el-input v-model="offlineContract" placeholder="离线合同号" size="small" style="width: 140px" clearable/>
|
||||
<!-- <span>供应商:</span>-->
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>
|
||||
<el-button
|
||||
type="success"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
|
||||
@click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
@@ -617,8 +615,25 @@
|
||||
style="margin-left: 10px"
|
||||
@click="addMateriel">选入物料</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
|
||||
<el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
|
||||
</el-tooltip>
|
||||
<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>
|
||||
<el-tooltip :content="hasTax" placement="top">
|
||||
<el-switch
|
||||
v-model="hasTax"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949"
|
||||
active-value="含税"
|
||||
inactive-value="未税"
|
||||
style="margin: 3px;float:right"/>
|
||||
</el-tooltip>
|
||||
<el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
|
||||
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
|
||||
<el-button v-if="quickChangePrice" size="mini" style="float:right; width：80px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
|
||||
<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
|
||||
</div>
|
||||
<el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table v-loading="" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table-column label="详情" type="expand" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<el-form label-position="left" inline class="demo-table-expand">
|
||||
@@ -628,24 +643,24 @@
|
||||
</el-form>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同状态" align="center" width="100" fixed="left">
|
||||
<el-table-column label="合同状态" align="center" width="80" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="editing(scope.row)" type="warning" size="small">编辑中</el-tag>
|
||||
<el-tag v-if="purchasing(scope.row)" type="primary" size="small">已采购</el-tag>
|
||||
<el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" min-width="170">
|
||||
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.离线合同编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="离线合同名称" align="center" min-width="170">
|
||||
<el-table-column label="离线合同名称" align="center" min-width="130" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.离线合同名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="220" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
@@ -665,12 +680,12 @@
|
||||
{{ scope.row.规定到货时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="240" fixed="right">
|
||||
<el-table-column label="操作" align="center" width="120" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="arrival(scope.row)" type="warning" plain size="mini" @click="editOfflineContract(scope.row)">编辑</el-button>
|
||||
<el-button :disabled="arrival(scope.row)" type="danger" plain size="mini" @click="deleteOfflineContract(scope.row)">删除</el-button>
|
||||
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/>
|
||||
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="导出合同" placement="top">
|
||||
<el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
|
||||
<el-button type="text" size="mini" icon="el-icon-right" plain @click="exportExcel(scope.row)"/>
|
||||
</el-tooltip>
|
||||
|
||||
</template>
|
||||
@@ -683,26 +698,9 @@
|
||||
:page-size="pageSize2"
|
||||
:total="total2"
|
||||
style="display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
layout="total"
|
||||
@size-change="handleSizeChange2"
|
||||
@current-change="handleCurrentChange2"/>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
|
||||
<el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
|
||||
</el-tooltip>
|
||||
<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>
|
||||
<el-tooltip :content="hasTax" placement="top">
|
||||
<el-switch
|
||||
v-model="hasTax"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949"
|
||||
active-value="含税"
|
||||
inactive-value="未税"
|
||||
style="margin: 3px;float:right"/>
|
||||
</el-tooltip>
|
||||
<el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
|
||||
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
|
||||
<el-button v-if="quickChangePrice" size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
|
||||
<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
|
||||
</div>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible4" title="使用滞货" center style="min-height: 300px;" width="400px">
|
||||
<span>使用滞货数量：</span>
|
||||
@@ -715,43 +713,43 @@
|
||||
</el-dialog>
|
||||
<!--<h3>合同详细信息</h3>-->
|
||||
<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.离线合同编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名称" align="center" min-width="150">
|
||||
<!-- <el-table-column label="离线合同编号" align="center" width="110">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{ scope.row.离线合同编号 }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="物料名称" align="center" min-width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<el-table-column label="规格" align="center" width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="200">
|
||||
<el-table-column label="图号或型号" align="center" min-width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px"/>
|
||||
<b v-else>{{ scope.row.数量 }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" min-width="60">
|
||||
<el-table-column label="单位" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="参考价格" align="center" min-width="100">
|
||||
<el-table-column label="参考价格" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.参考价格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价(未税)" align="center" min-width="100" prop="单价">
|
||||
<el-table-column label="单价(未税)" align="center" width="80" prop="单价">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" :disabled="disable" size="mini" style="width:70px"/>
|
||||
<b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
|
||||
@@ -763,28 +761,28 @@
|
||||
<b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总额(未税)" align="center" min-width="100" prop="合计">
|
||||
<el-table-column label="总额(未税)" align="center" width="80" prop="合计">
|
||||
<template slot-scope="scope">
|
||||
{{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总额(含税)" align="center" min-width="100" prop="合计">
|
||||
<el-table-column label="总额(含税)" align="center" width="80" prop="合计">
|
||||
<template slot-scope="scope">
|
||||
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 2, 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="150" prop="备注">
|
||||
<el-table-column label="备注" align="center" min-width="160" prop="备注">
|
||||
<template slot-scope="scope">
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期要求" align="center" min-width="130" prop="交货期要求">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 2, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.交货期要求" :disabled="disable" size="mini" style="width:90px"/>
|
||||
<b v-else>{{ scope.row.交货期要求 || '—' }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="disable" label="到货数量" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货数量 }}
|
||||
@@ -922,10 +920,19 @@
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="供应商名称" prop="供应商名称">
|
||||
<el-input v-model="form2.供应商名称" size="small" readonly>
|
||||
<el-button slot="append" icon="el-icon-search" @click="dialogVisible1=true"/>
|
||||
</el-input>
|
||||
<el-select v-model="form2.供应商名称" style="width:150px" placeholder="供应商" size="small" filterable>
|
||||
<el-option
|
||||
v-for="item in supplierNames"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="供应商名称" prop="供应商名称">-->
|
||||
<!-- <el-input v-model="form2.供应商名称" size="small" readonly>-->
|
||||
<!-- <el-button slot="append" icon="el-icon-search" @click="dialogVisible1=true"/>-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="规定到货时间" prop="规定到货时间">
|
||||
@@ -1008,7 +1015,7 @@
|
||||
<script>
|
||||
import { tiaozheng2, tiaozheng1, searchOfflineContract, searchOfflineContract2, searchSupplier, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel, searchMaterial1,
|
||||
addMateriel, deleteMateriel, saveOfflineContact, doneOfflineContact, searchMaterial22, searchMachine, searchGroup, initProject, changeNum, submitUseInventory,
|
||||
searchPart, getPerson } from '@/api/PurchasingCenter/OfflineContract'
|
||||
searchPart, getPerson, searchSupplier1 } from '@/api/PurchasingCenter/OfflineContract'
|
||||
import QRCode from 'qrcode'
|
||||
import $ from 'jquery'
|
||||
import { mapGetters } from 'vuex'
|
||||
@@ -1017,6 +1024,7 @@ export default {
|
||||
name: '', // 离线合同
|
||||
data() {
|
||||
return {
|
||||
supplierNames: [],
|
||||
startTime: '',
|
||||
标准件和外购件流水号: [],
|
||||
基本件流水号: [],
|
||||
@@ -1045,7 +1053,7 @@ export default {
|
||||
tableData02: [],
|
||||
tableData22: [],
|
||||
dialogVisible0: false,
|
||||
materialStatusValue: [0], // 物料状态
|
||||
materialStatusValue: [3], // 物料状态
|
||||
materialStatus: [
|
||||
{
|
||||
value: 0,
|
||||
@@ -1140,7 +1148,7 @@ export default {
|
||||
group: [],
|
||||
total2: 0,
|
||||
pageCurrent2: 1,
|
||||
pageSize2: 10,
|
||||
pageSize2: 10000,
|
||||
dialogVisible1: false,
|
||||
form1: {},
|
||||
supplierCheck1: 0,
|
||||
@@ -1218,7 +1226,7 @@ export default {
|
||||
created() {
|
||||
this.getPerson()
|
||||
this.fetchData()
|
||||
this.searchTable2()
|
||||
// this.searchTable2()
|
||||
this.searchTable11()
|
||||
this.initDirection()
|
||||
},
|
||||
@@ -1354,10 +1362,10 @@ export default {
|
||||
return Number(row.离线合同状态) === 1
|
||||
},
|
||||
purchasing(row) {
|
||||
return Number(row.离线合同状态) === 2 && Number(row.总采购数量) !== Number(row.总到货数量)
|
||||
return Number(row.离线合同状态) === 2 && Number(row.总采购数量) > Number(row.总到货数量)
|
||||
},
|
||||
arrival(row) {
|
||||
return Number(row.总采购数量) === Number(row.总到货数量) && Number(row.总采购数量) !== 0
|
||||
return Number(row.总采购数量) <= Number(row.总到货数量) && Number(row.总采购数量) !== 0
|
||||
},
|
||||
useqrcode(contractNum) {
|
||||
const opts = {
|
||||
@@ -1429,6 +1437,7 @@ export default {
|
||||
if (this.$refs['form2'] !== undefined) {
|
||||
this.$refs['form2'].resetFields()
|
||||
}
|
||||
this.getSupplier1()
|
||||
this.title2 = '创建离线合同'
|
||||
this.form2.离线合同编号 = ''
|
||||
this.form2.离线合同名称 = ''
|
||||
@@ -1438,6 +1447,18 @@ export default {
|
||||
this.form2.离线合同备注 = '付款方式：；付款时间：；到货时间：；开票信息：；其他说明：；'
|
||||
this.dialogVisible2 = true
|
||||
},
|
||||
getSupplier1() {
|
||||
this.supplierNames = []
|
||||
this.form2.供应商名称 = ''
|
||||
searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.supplierNames.push({
|
||||
label: response.data[i].供应商名称,
|
||||
value: response.data[i].供应商流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
submitAddOfflineContract() { // 新建离线合同
|
||||
this.$refs['form2'].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -1450,10 +1471,11 @@ export default {
|
||||
if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
|
||||
this.$message.error('该离线合同编号已存在')
|
||||
} else {
|
||||
addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
|
||||
addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商名称, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('新建离线合同成功')
|
||||
this.searchTable2()
|
||||
this.offlineContract = this.form2.离线合同编号
|
||||
this.searchTable2(this.offlineContract)
|
||||
this.dialogVisible2 = false
|
||||
} else { this.$message.error('新建离线合同失败') }
|
||||
})
|
||||
|
||||
@@ -21,65 +21,65 @@
|
||||
</div>
|
||||
<h3>请款表</h3>
|
||||
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" width="220" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
|
||||
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款人" prop="姓名" align="center" min-width="80">
|
||||
<el-table-column label="请款人" prop="姓名" align="center" min-width="70" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
|
||||
<el-table-column label="请款金额" align="center" width="70" prop="请款金额">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="请款付款情况" align="center">-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="审核情况内容" width="100" align="center">
|
||||
<el-table-column label="审核内容" width="80" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未通过审核原因" width="110" align="center">
|
||||
<el-table-column label="未过审核原因" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批情况内容" width="100" align="center">
|
||||
<el-table-column label="审批内容" width="70" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未通过审批原因" width="130" align="center">
|
||||
<el-table-column label="未通过审批原因" width="110" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款情况" width="100" align="center">
|
||||
<el-table-column label="付款情况" width="80" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未付款原因" width="130" align="center">
|
||||
<el-table-column label="未付款原因" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="250">
|
||||
<el-table-column label="操作" align="center" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-popover placement="right" width="500" trigger="click">
|
||||
<el-table :data="gridData" highlight-current-row size="mini" show-summary @row-click="searchContract">
|
||||
@@ -100,9 +100,9 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-button slot="reference" type="primary" plain size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
|
||||
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">详情</el-button>
|
||||
</el-popover>
|
||||
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
|
||||
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -32,6 +32,7 @@ import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCente
|
||||
import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
|
||||
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
|
||||
import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
|
||||
import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
|
||||
export default {
|
||||
components: {
|
||||
Breadcrumb,
|
||||
@@ -47,7 +48,8 @@ export default {
|
||||
noticeContract5: null,
|
||||
noticeContract6: null,
|
||||
noticeFund: null,
|
||||
noticeInvoice: null
|
||||
noticeInvoice: null,
|
||||
noticeContractKG: null
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -70,12 +72,33 @@ export default {
|
||||
} else if (this.token.toString() === '2' || this.token.toString() === '3') {
|
||||
this.comfirmMaterial_CG()
|
||||
this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
|
||||
} else if (this.token.toString() === '15') {
|
||||
this.comfirmMaterial_KG()
|
||||
this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
|
||||
}
|
||||
},
|
||||
beforeDestroy() {
|
||||
clearInterval(this.timer)
|
||||
},
|
||||
methods: {
|
||||
comfirmMaterial_KG() {
|
||||
getPickingList().then(res => {
|
||||
if (res.data.length) {
|
||||
this.noticeContractKG = null
|
||||
this.noticeContractKG = this.$notify.success({
|
||||
title: '提示',
|
||||
message: '您有新的领料单需要备料确认，请及时处理，点击查看',
|
||||
onClick: () => {
|
||||
setPickingList().then(res => {
|
||||
this.$router.push({ path: '/Inventory/MaterialOut' })
|
||||
setTimeout(this.noticeContractKG.close(), 1000)
|
||||
})
|
||||
},
|
||||
duration: 1000 * 60
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
comfirmMaterial_CG() {
|
||||
getMaterial_NOTES().then(res => {
|
||||
if (res.data.length) {
|
||||
|
||||
Reference in New Issue
Block a user