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

lxparts

Browse Source
This commit is contained in:
lixin
2018-12-21 19:20:03 +08:00
parent 7994ed0baa
commit bdb80fa59e
9 changed files with 199 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/Inventory/DirectPart.js
View File

@@ -72,14 +72,14 @@ export function searchDirectPart(pageCurrent, pageSize, project_check, project,
})
}
// 人员查询 需要在部门确定之后修改
export function searchPeople() {
export function searchPeople(data1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=18'
name: '库存管理_人员查询_库存部门',
param: '角色编号=' + data1
}
})
}

25
src/api/Inventory/InboundCard.js
View File

@@ -10,6 +10,17 @@ export function searchContract() {
}
})
}
export function searchShopContract() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存管理_车间采购合同查询'
}
})
}
// 仓库查询
export function searchInventory() {
return request({
@@ -33,7 +44,7 @@ export function searchInbound(data1, data2, data3) {
}
})
}
// 入库记录查询
// 车间采购查询
export function searchShopInbound(data1, data2, data3) {
return request({
url: '',
@@ -108,3 +119,15 @@ export function addInboundCardDetail(data1, data2, data3, data4, data5, data6, d
})
}
// 入库单明细查询
export function deleteInboundCardDetail(data1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_采购入库单_采购入库单明细删除',
param: '采购入库单明细流水号=' + data1
}
})
}

6
src/api/Inventory/OfflinePartOut.js
View File

@@ -47,14 +47,14 @@ export function searchPart() {
})
}
// 人员查询 需要在部门确定之后修改
export function searchPeople() {
export function searchPeople(data1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=' + 18
name: '库存管理_人员查询_库存部门',
param: '角色编号=' + data1
}
})
}

5
src/views/Inventory/DirectPart/index.vue
View File

@@ -250,7 +250,8 @@ export default {
},
computed: {
...mapGetters([
'id'
'id',
'token'
])
},
created() {
@@ -292,7 +293,7 @@ export default {
},
searchPeopleData() { // 查询人员
this.People = []
searchPeople().then(response => {
searchPeople(this.token).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
label: response.data[i].姓名,

213
src/views/Inventory/InboundCard/index.vue
View File

@@ -50,11 +50,21 @@
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" align="center" min-width="80">
<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">
<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.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.实际到货数量 }}
@@ -65,25 +75,20 @@
{{ scope.row.单价 }}
</template>
</el-table-column>
<el-table-column label="本币单价" align="center" min-width="80">
<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="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选入</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
<el-tab-pane label="车间采购" name="second">
<el-card>
<span>采购合同编号:</span>
<el-select v-model="ContractValue" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-select v-model="ShopContractValue" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
v-for="item in ShopContract"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -104,8 +109,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" @click="searchPartinfo()">导出</el-button>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchShopinfo()">查询</el-button>
</el-card>
<el-card>
<el-table
@@ -127,11 +131,21 @@
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" align="center" min-width="80">
<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">
<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.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.实际到货数量 }}
@@ -142,16 +156,11 @@
{{ scope.row.单价 }}
</template>
</el-table-column>
<el-table-column label="本币单价" align="center" min-width="80">
<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="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选入</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
@@ -170,7 +179,7 @@
style="width: 100%;"
size="mini"
height="200"
@row-click = "searchDetail()">
@row-click = "searchDetail">
<el-table-column
label="序号"
align="center"
@@ -238,7 +247,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -265,60 +274,44 @@
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="100">
<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="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
{{ 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.物料规格 }}
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="130">
<el-table-column label="零件图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
{{ scope.row.图号 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="130">
<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="130">
<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="50">
<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="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.货位名称 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.备注 }}
{{ scope.row.本币单价 * scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="200">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 10px 10px" @click="editListDetailx(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropListdetail(scope.row)">删除</el-button>
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropCarddetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -379,17 +372,75 @@
<el-button type="primary" size="small" @click="submitCard">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="合同名称" prop="合同名称">
<el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="仓库名称" prop="仓库名称">
<el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option
v-for="item in Inventory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="入库日期" prop="入库日期">
<el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="到货单号" prop="到货单号">
<el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务号" prop="业务号">
<el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务员" prop="业务员">
<el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
<el-option
v-for="item in People"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="到货日期" prop="到货日期">
<el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="业务类型" prop="业务类型">
<el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
</el-form-item>
<el-form-item label="采购类型" prop="采购类型">
<el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
</el-form-item>
<el-form-item label="备注" prop="备注">
<el-input v-model="form.note" placeholder="备注" size="small" clearable/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible2=false">取消</el-button>
<el-button type="primary" size="small" @click="editCard">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail } from '@/api/Inventory/InboundCard'
import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract } from '@/api/Inventory/InboundCard'
import { mapGetters } from 'vuex'
export default {
data() {
return {
Contract: [],
Contract: [], // 采购合同
ShopContract: [], // 车间采购合同
ContractValue: '',
ShopContractValue: '', // 车间采购合同流水号
Inventory: [],
InventoryValue: '',
InboundDate: '',
@@ -405,6 +456,7 @@ export default {
listLoading4: '',
tableData4: [],
dialogVisible1: false,
dialogVisible2: false,
People: [],
form: {
contract: '',
@@ -437,7 +489,8 @@ export default {
paintGroup: [],
numberGroup: [],
priceGroup: [],
DetailNumber: ''
DetailNumber: '',
CardDetailNumber: '' // 入库单明细流水号
}
},
computed: {
@@ -460,6 +513,16 @@ export default {
})
}
})
// 查询车间合同
searchContract().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.ShopContract.push({
label: response.data[i].采购合同编号,
value: response.data[i].采购合同流水号
})
}
})
searchShopContract
searchAffairPeople(this.token).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
@@ -483,6 +546,11 @@ export default {
this.tableData = []
this.listLoading = true
searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].组件零件流水号 !== 0) {
response.data[i].物料名称 = response.data[i].零件名称
}
}
this.tableData = response.data
this.total = response.data.total
this.listLoading = false
@@ -491,10 +559,10 @@ export default {
searchShopinfo() {
this.tableData2 = []
this.listLoading2 = true
searchShopInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => {
searchShopInbound(this.ShopContractValue, this.InboundDate, this.InventoryValue).then(response => {
this.tableData2 = response.data
this.total = response.data.total
this.listLoading = false
this.listLoading2 = false
})
},
searchInboundCard1() {
@@ -539,7 +607,7 @@ export default {
this.modelGroup.push(val[i].物料规格)
this.specificationGroup.push(val[i].物料型号)
this.paintGroup.push(val[i].零件图号)
this.numberGroup.push(val[i].数量)
this.numberGroup.push(val[i].实际到货数量)
this.priceGroup.push(val[i].单价)
}
},
@@ -555,7 +623,7 @@ export default {
this.modelGroup.push(val[i].物料规格)
this.specificationGroup.push(val[i].物料型号)
this.paintGroup.push(val[i].零件图号)
this.numberGroup.push(val[i].数量)
this.numberGroup.push(val[i].实际到货数量)
this.priceGroup.push(val[i].单价)
}
},
@@ -564,16 +632,45 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
} else {
this.$message.error('增加失败')
}
})
},
// 查询采购入库单明细
searchDetail(row) {
this.DetailNumber = row.请购入库单流水号
this.DetailNumber = row.采购入库单流水号
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
},
// 删除领料单明细
dropCarddetail(row) {
this.CardDetailNumber = row.采购入库单明细流水号
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteInboundCardDetail(this.CardDetailNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
} else {
this.$message.error('数据占用')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}
}
}

1
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -315,7 +315,6 @@ export default {
// 获取人员编号
getpeopleid() {
this.role = this.token
console.log(this.role, 321312)
this.searchPeopleData()
},
// 查询仓库

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

@@ -183,7 +183,8 @@ export default {
},
computed: {
...mapGetters([
'id'
'id',
'token'
])
},
created() {
@@ -263,7 +264,7 @@ export default {
this.dialogFormVisible = false
},
searchPeopleData() { // 查询人员
searchPeople().then(response => {
searchPeople(this.token).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
label: response.data[i].姓名,

9
src/views/Inventory/PickingList/index.vue
View File

@@ -656,14 +656,19 @@ export default {
this.listLoading1 = true
this.listLoadingx = true
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
console.log(response)
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件基本件流水号 === '0') {
response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
}
}
this.tableDataPurchase = response.data.rows
console.log(this.tableDataPurchase, 124124)
this.listLoading = false
this.total1 = response.data.total
})
searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
const data = response.data.rows
console.log(data, 323423)
for (let i = 0; i < data.length; i++) {
data[i].可出库数量 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}

2
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -408,7 +408,7 @@
<script>
import elInput from 'element-ui/packages/input'
import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
export default {
components: {
elInput