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
2018-11-23 13:58:46 +08:00
parent d79f65b4d7 57eecde546
commit abb1fe3912
3 changed files with 149 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/request.js
View File

@@ -10,10 +10,11 @@ export const name = `OP8888`
export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

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

@@ -76,7 +76,6 @@
</template>
</el-table-column>
</el-table>
</el-card>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent"
@@ -87,6 +86,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-row>
<el-col :span="11">
@@ -127,7 +127,7 @@
</el-col>
<el-col :span="2">
<div style="margin: 10px 15px">
<el-button size="small" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange()" >交换</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange('form')" >交换</el-button>
</div>
</el-col>
<el-col :span="11">
@@ -167,24 +167,6 @@
</el-col>
</el-row>
<!--新增交换件对话框-->
<el-dialog :title="title" :visible.sync="dialogFormVisible" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="交换单编号" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="请输入零件交换单编号" style="width: 200px"/>
</el-form-item>
<el-form-item label="交换数量" prop="TotalContractAmount" label-width="100px">
<el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="备注" prop="TotalContractAmount" label-width="100px">
<el-input v-model="form.ExchangeNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<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('form')">确定</el-button>
</div>
</el-dialog>
</el-card>
<el-card>
<el-table
@@ -245,7 +227,6 @@
</template>
</el-table-column>
</el-table>
</el-card>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
@@ -256,6 +237,25 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="交换单编号" prop="ExchangeNumber" label-width="100px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="请输入零件交换单编号" style="width: 200px"/>
</el-form-item>
<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="ExchangeNote" label-width="100px">
<el-input v-model="form.ExchangeNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<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>
</div>
</el-dialog>
</div>
</template>
@@ -265,13 +265,15 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
ProjectValue: ' ',
count1: 0,
count2: 0, // 清表单验证计数器
ProjectValue: '',
Project: [],
ProjectValue_check: 1,
MachineValue: ' ',
MachineValue: '',
Machine: [],
MachineValue_check: 1,
GroupNumValue: ' ',
GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
tableDataBasic: [],
@@ -302,7 +304,7 @@ export default {
rules: { // 表单验证规则
ExchangeNumber: [{ required: true, message: '请输入交换件编号', trigger: 'blur' }],
ExchangeNumberx: [{ required: true, message: '请输入交换件数量', trigger: 'blur' }],
ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'change' }]
ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'blur' }]
},
PageCurrent: 1,
PageSize: 10,
@@ -334,7 +336,6 @@ export default {
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
console.log(this.picikingPeople)
},
searchMachine() { // 查询机床
if (this.ProjectValue === '') {
@@ -362,19 +363,18 @@ export default {
searchPartinfo() {
this.tableDataPurchase = []
this.tableDataBasic = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
}
this.listLoading = true
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data.rows
console.log(this.tableDataPurchase)
this.total = response.data.total
})
this.listLoading = false
@@ -397,39 +397,66 @@ export default {
this.listLoading1 = false
})
},
handleSizeChange1(val) {
this.PageCurrent1 = 1
this.PageSize1 = val
this.getExchangeTable()
},
handleCurrentChange1(val) {
this.PageCurrent1 = val
this.getExchangeTable()
},
// 选择领料单
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
console.log(this.pickingListNumberx)
this.searchListDetailt()
},
// 增加交换件
addListDetailinfor() {
addListDetailinfor(form) {
this.$refs[form].validate((valid) => {
if (valid) {
addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }
})
}).then(() => {
this.dialogFormVisible = false
this.PageCurrent1 = 1
this.getExchangeTable()
})
}
})
},
// 打开交换表单
exchange() {
exchange(form) {
if (this.tableData1.length === 0) {
this.$message.error('请选择交换件')
} else if (this.tableData2.length === 0) {
this.$message.error('请选择交换件')
} else {
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[form].resetFields()
}
this.title = '交换'
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = true
}
},
// 重置表单
callOff() {
callOff(formName) {
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = false
this.$refs[formName].resetFields()
},
// 选中零件交换
selecting(row) {
const arr = new Array(row)
this.tableData1 = arr
console.log(this.tableData1)
},
// 选中被零件交换
selected(row) {
@@ -448,8 +475,9 @@ export default {
dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.getExchangeTable().then(response => {
})
this.dialogFormVisible = false
this.PageCurrent1 = 1
this.getExchangeTable()
} else {
this.$message.error('删除失败')
}

82
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -614,13 +614,13 @@ export default {
PurchasePartOut: [], // 外购件出库记录
PurchasePartIn: [], // 外购件入库记录
tableDataStandard: [], // 标准件
ProjectValue: ' ',
ProjectValue: '',
Project: [],
ProjectValue_check: 1,
MachineValue: ' ',
MachineValue: '',
Machine: [],
MachineValue_check: 1,
GroupNumValue: ' ',
GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
ContractDetailValue: '',
@@ -672,10 +672,13 @@ export default {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
},
searchMachine() { // 查询机床
if (this.ProjectValue === ' ') {
this.ProjectValue_check = 0
}
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
this.Machine = []
this.GroupNum = []
this.MachineValue = ''
this.GroupNumValue = ''
console.log(this.ProjectValue)
if (this.ProjectValue !== '') {
searchmachine(1, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
@@ -683,12 +686,15 @@ export default {
})
}
})
}
},
searchGroupList() { // 查询组号
this.GroupNum = []
this.GroupNumValue = ''
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
label: response.data[i].组件名称,
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
@@ -698,23 +704,26 @@ export default {
searchPurchasePartinfo() {
this.listLoading6 = true
this.tableDataPurchase = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchPurchasePart(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data.rows
this.total2 = response.data.total
this.listLoading6 = false
})
this.projectValue = ' '
this.MachineValue = ' '
this.GroupNumValue = ' '
},
// 查询外购件记录
searchPurchasePartRecord(row) {
@@ -735,14 +744,20 @@ export default {
searchStandardPartinfo() {
this.listLoading9 = true
this.tableDataStandard = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchStandardPart(this.PageCurrent3, this.PageSize3, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataStandard = response.data.rows
@@ -750,9 +765,6 @@ export default {
this.listLoading9 = false
console.log(this.tableDataPurchase)
})
this.projectValue = ' '
this.MachineValue = ' '
this.GroupNumValue = ' '
},
standardselecting(row) {
this.contractDeatilNumber = row.采购合同明细流水号
@@ -780,45 +792,51 @@ export default {
searchGeneralPartinfo() {
this.listLoading3 = true
this.tableDataGeneral = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchGeneralPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataGeneral = response.data.rows
this.total1 = response.data.total
this.listLoading3 = false
})
this.projectValue = ' '
this.MachineValue = ' '
this.GroupNumValue = ' '
},
// 查询基本件
searchBasciPartinfo() {
this.listLoading = true
this.tableDataBasic = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchBasicPart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataBasic = response.data.rows
this.listLoading = false
this.total = response.data.total
})
this.projectValue = ' '
this.MachineValue = ' '
this.GroupNumValue = ' '
},
// 查询基本件记录
searchBasicPartRecord(row) {