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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-11-25 16:06:55 +08:00
parent dfce34e4b4 be524dc8c1
commit d7cb18413f
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,6 +188,9 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="领料部门" label-width="100px" size="small">
<el-input v-model="form3.department" size="small" placeholder="领料部门" style="width: 200px"/>
</el-form-item>
<el-form-item label="人员编号" prop="password" label-width="100px" size="small">
<el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>
</el-form-item>
@@ -272,6 +275,7 @@ export default {
},
form3: {
outTypeValue: '',
department: '',
password: ''
},
form4: {
@@ -434,6 +438,7 @@ export default {
inputPassword() {
this.form3.outTypeValue = ''
this.form3.password = ''
this.form3.department = ''
this.dialogFormVisible3 = true
},
selectable(row, index) { // 控制某行是否可选
@@ -559,7 +564,7 @@ export default {
this.outNumber.push(this.pickListTable2[i].出库数量)
}
}
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum).then(response => {
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.form3.department).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible3 = false

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

@@ -9,7 +9,7 @@
</el-row>
<span>物料型号：</span>
<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
</el-card>
<el-card>
@@ -113,7 +113,12 @@
{{ scope.row.出库人姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="140">
<el-table-column label="领料部门" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.领料部门 }}
</template>
</el-table-column>
<el-table-column label="领料人" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -152,15 +157,6 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="分组" prop="GroupNumValue" label-width="100px">
<el-select v-model="form.GroupNumValue" filterable size="small" placeholder="分组" style="width: 200px;margin-right:10px">
<el-option
v-for="item in GroupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="出库数量" prop="DirectNumber" label-width="100px" size="small">
<el-input v-model="form.DirectNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
@@ -173,6 +169,9 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item label="领料部门" prop="DirectNumber" label-width="100px" size="small">
<el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>
</el-form-item>
<el-form-item label="领料人" prop="DirectNote" label-width="100px">
<el-input v-model="form.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>
</el-form-item>
@@ -208,6 +207,7 @@ export default {
ProjectValue: '',
MachineValue: '',
GroupNumValue: '',
department: '',
DirectNumber: '',
PeopleValue: '',
DirectNote: ''
@@ -230,7 +230,7 @@ export default {
listLoading1: '',
partnumber: '',
pageCurrent1: 1,
pageSize1: 10,
pageSize1: 20,
total1: 0,
pageCurrent2: 1,
pageSize2: 10,
@@ -377,7 +377,7 @@ export default {
} else {
this.$refs['form'].validate((valid) => {
if (valid) {
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号).then(response => {
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.form.department).then(response => {
if (response.data[0].result === '1') {
this.$message.success('零件出库成功')
this.dialogFormVisible = false

11
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -450,6 +450,16 @@ export default {
if (response.data[0].result === '1') {
this.contractNumType = 1
this.dialogVisible2 = false
this.contractNum = []
initPurchaseOrder().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.contractNum.push({
label: response.data[i].请购单编号,
value: response.data[i].请购单流水号,
id: response.data[i].请购类型
})
}
})
this.searchData()
this.$message.success('转换成功')
} else {
@@ -491,6 +501,7 @@ export default {
this.form3.机床 = response.data[0].机床图号
this.form3.groupNumValue = response.data[0].组件流水号
console.log(this.machineValue, 111)
this.groupNum = []
initGroupNum(this.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({