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

lx

Browse Source
This commit is contained in:
lixin
2019-01-05 18:56:09 +08:00
parent 0713f0f364
commit 90c459364b
9 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,15 +96,15 @@ export function dropExchangeList(PickingListNumberx) {
}
})
}
// 删除交换单
export function editExchangeList(data1, data2, data3, data4) {
// 交换单修改
export function editExchangeList(data1, data2, data3, data4, data5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件_交换单修改',
param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&备注=' + data4
param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&领料单流水号=' + data4 + '&备注=' + data5
}
})
}

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

@@ -142,7 +142,7 @@ export function addInboundCardDetail(data1, data2, data3, data4, data5, data6, d
})
}
// 入库单明细查询
// 入库单明细删除
export function deleteInboundCardDetail(data1) {
return request({
url: '',

2
src/utils/request.js
View File

@@ -20,8 +20,8 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间

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

@@ -367,7 +367,7 @@ export default {
this.dialogFormVisible1 = true
this.directPartNumber = row.直达件流水号
this.form.DirectNumber = row.到货数量
this.PeopleValue = parseInt(row.领用人员流水号)
this.form.getPeople = parseInt(row.领用人员流水号)
this.form.DirectNote = row.备注
},
// 修改直达件

7
src/views/Inventory/ExchangePart/index.vue
View File

@@ -250,7 +250,7 @@
<el-form-item label="交换数量" prop="ExchangeNumberx" label-width="100px">
<el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="领料单" prop="ExchangeNumberx" label-width="100px">
<el-form-item label="领料单" prop="PickingListNumber" label-width="100px">
<el-select v-model="PickingListNumber" filterable clearable size="small" placeholder="领料单号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in PickingList"
@@ -266,7 +266,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button v-show="title==='交换'" type="primary" @click="addListDetailinfor('form')">确 定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit(scope.$index, scope.row, 'form')">确定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -553,12 +553,13 @@ export default {
this.exchangeListNumber = row.交换单流水号
this.form.ExchangeNumber = row.交换单编号
this.form.ExchangeNumberx = row.交换数量
this.PickingListNumber = parseInt(row.领料单流水号)
this.form.ExchangeNote = row.备注
this.title = '编辑'
this.dialogFormVisible = true
},
submitEdit() {
this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false })
this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.PickingListNumber, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false })
}
}
}

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

@@ -141,6 +141,11 @@
{{ 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>
</el-card>
</div>

6
src/views/Inventory/OfflinePurchase/index.vue
View File

@@ -133,12 +133,6 @@
</el-card>
<el-card>
<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="80" fixed="left">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否传递)===0" type="warning" size="small">未传递</el-tag>
<el-tag v-if="parseInt(scope.row.是否传递)===1" type="primary" size="small">已传递</el-tag>
</template>
</el-table-column>
<el-table-column label="请购单编号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请购单编号 }}

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

@@ -522,7 +522,7 @@ export default {
partMachineName: '', // 机床名称
partGroupNumber: '', // 分组流水号
partGroupName: '', // 分组名称
form: {
form: { // 基本件出库
OutNumber: '', // 出库数量
outNote: '' // 出库备注
},
@@ -530,7 +530,7 @@ export default {
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
},
form2: {
form2: { // 外购件出库
OutNumber: '', // 出库数量
outNote: '' // 出库备注
},
@@ -538,7 +538,7 @@ export default {
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
},
form3: {
form3: { // 车间采购出库
OutNumber: '', // 出库数量
outNote: '' // 出库备注
},
@@ -876,7 +876,7 @@ export default {
},
// 增加外购件领料单明细
addListDetailinfor(row) {
this.form = []
this.form2 = []
this.outType = 2
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
@@ -925,7 +925,7 @@ export default {
},
// 增加车间采购领料单明细
addWorkshopDetailinfor(row) {
this.form = []
this.form3 = []
this.outType = 3
console.log(row)
this.partProjectNumber = row.项目流水号

13
src/views/Inventory/SubstitutePart/index.vue
View File

@@ -128,10 +128,10 @@
</div>
</el-col>
<el-col :span="2">
<div style="margin: 0px 15px">
<div style="margin: 0px 25px">
<el-button size="small" type="warning" icon="el-icon-edit" @click="addSub()" >替换件</el-button>
</div>
<div style="margin: 10px 15px">
<div style="margin: 10px 29px">
<el-button size="small" type="primary" icon="el-icon-edit" @click="exchange()" >替换</el-button>
</div>
</el-col>
@@ -158,11 +158,6 @@
{{ 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.物料规格 }}
@@ -192,7 +187,7 @@
</div>
</el-dialog>
<!--选择替换件-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增替换件" center width="600px">
<el-dialog :visible.sync="dialogFormVisible2" title="被替换件" center width="600px" height="600px">
<el-form :rules="rules" label-position="left">
<el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="mini">
<el-input v-model="materialName" size="small" placeholder="物料名称" style="width: 200px"/>
@@ -203,7 +198,7 @@
border
size = "mini"
style="width: 100%;"
height="100">
height="200px">
<el-table-column
label="序号"
align="center"