刘璐珈

This commit is contained in:
Vergil
2020-03-10 16:23:48 +08:00
parent cb119988c7
commit 2f765422b5
8 changed files with 329 additions and 203 deletions

View File

@@ -41,7 +41,7 @@
</el-row>
<!--:row-class-name="tableRowClassName"-->
<el-table
v-loading=""
v-loading="loading1"
:data="tableData00"
border
style="width: 100%;max-height: 500px;"
@@ -164,32 +164,32 @@
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row>
<el-table
v-loading=""
v-loading="loading2"
:data="tableData22"
border
stripe
style="width: 100%;max-height: 500px;"
style="width: 594px;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1"
@select="handleSelection1">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
<el-table-column align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="153" show-overflow-tooltip>
<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" width="128" 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="物料规格" width="119" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</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" width="132">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
@@ -221,7 +221,7 @@
</el-tooltip>
<!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
<el-tooltip :content="hasTax" placement="top">
<el-tooltip :content="hasTax" placement="top" style="margin-right: 370px">
<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"/>
@@ -229,12 +229,12 @@
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
</el-tooltip>
<el-button type="warning" size="small" plain style="float:right;margin-left:10px;" @click="addOfflineContract">创建离线合同</el-button>
<el-button type="warning" size="small" plain style="float:right;margin-right:10px;" @click="addOfflineContract">创建离线合同</el-button>
<!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @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 stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="详情" type="expand" fixed="left">
<el-table v-loading="loading3" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="详情" type="expand" fixed="left" width="50px">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="离线合同备注">
@@ -250,22 +250,22 @@
<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="150">
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="离线合同名称" align="center" min-width="130" show-overflow-tooltip>
<el-table-column label="离线合同名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.离线合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="220" 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" min-width="80">
<el-table-column label="采购员" prop="采购员" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.采购员 }}
</template>
@@ -275,12 +275,12 @@
{{ scope.row.创建日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="规定到货时间" align="center" width="100">
<el-table-column label="规定到货时间" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.规定到货时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120" fixed="right">
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<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)"/>
@@ -694,6 +694,9 @@ export default {
PersonValue: '',
showMaterialTable: true,
loading1: false,
loading2: false,
loading3: false,
loading4: false,
title2: '',
purchaseStateValue: 2, // 采购状态 全部
purchaseState: [
@@ -1057,9 +1060,11 @@ export default {
searchTable2() { // 查询离线合同列表
this.offlineContract ? this.check3 = 1 : this.check3 = 0
this.supplierName0 ? this.check4 = 1 : this.check4 = 0
this.loading3 = true
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading3 = false
})
},
handleSizeChange2(val) { // 离线合同列表分页
@@ -1261,6 +1266,7 @@ export default {
this.stipulateArrivalTime = row.规定到货时间.split(' ')[0]
this.offlineContractNum = row.离线合同流水号
this.离线合同状态 = row.离线合同状态
this.loading4 = true
searchMateriel(this.offlineContractNum).then(response => {
console.log(response.data)
this.tableData3 = response.data
@@ -1270,6 +1276,7 @@ export default {
!v.单价 ? v.单价 = v.参考价格 : v.单价
this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
})
this.loading4 = false
})
this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式
},
@@ -1562,6 +1569,7 @@ export default {
},
searchTable11() { // 查询外购件列表
let check1, check5, check7
this.loading1 = true
this.materialName ? check1 = 1 : check1 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
@@ -1586,6 +1594,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
this.loading1 = false
}).catch(() => {
this.loading1 = false
})
},
handleSizeChange11(val) { // 标准件和外购件列表分页
@@ -1607,6 +1618,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
this.loading2 = true
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
@@ -1623,6 +1635,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
this.loading2 = false
}).catch(() => {
this.loading2 = false
})
},
handleSizeChange12(val) { // 基本件列表分页
@@ -1637,6 +1652,7 @@ export default {
searchTable22() {
let check1
this.materialName ? check1 = 1 : check1 = 0
this.loading2 = true
searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => {
console.log(response.data, 3333)
this.tableData22 = response.data.rows
@@ -1651,6 +1667,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
this.loading2 = false
}).catch(() => {
this.loading2 = false
})
},
handleSizeChange22(val) { // 仓库表分页