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

更新

Browse Source
This commit is contained in:
liushuai
2019-12-02 17:15:01 +08:00
parent f8b5751a21
commit f6ef7676e2
5 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -67,14 +67,14 @@ export function searchTable1(PurchaseOrder, check4) {
}
})
}
export function addData(num1, num2, id, time) {
export function addData(num1, num2, id, time, remarks) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_基本件采购_请购单_增加数据',
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks
}
})
}

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

18
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -219,7 +219,7 @@
</el-row>
</el-card>
<el-row>
<el-col style="width: 300px">
<el-col style="width: 400px">
<el-card>
<el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
<el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
@@ -242,6 +242,11 @@
{{ scope.row.请购时间 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="107px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" width="250px" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>-->
@@ -349,6 +354,12 @@
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.Remarks"
size="small"
style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取消</el-button>
@@ -563,7 +574,8 @@ export default {
form: {
请购单编号: '',
请购车间: '制造部',
请购时间: ''
请购时间: '',
Remarks: ''
},
rules: {
请购单编号: [{ required: true, message: '请输入请购单编号', trigger: 'blur' }],
@@ -908,7 +920,7 @@ export default {
submitAdd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
addData(this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => {
addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogFormVisible = false

23
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -515,35 +515,34 @@ export default {
submitChangeType(row) {
this.Number = row.id
this.Type = row.整改类型
if (row.整改类型 === 1) {
if (this.groupName.indexOf('MX') > -1) {
if (this.groupName.indexOf('MX') > -1) {
if (row.整改类型 === 1) {
update(this.projectName, this.machineValue, row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') {
this.fetchData()
}
})
} else {
update1(row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') {
this.fetchData()
}
})
}
} else {
if (row.整改类型 === 2) {
} else if (row.整改类型 === 2) {
this.title1 = '替换'
this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7)
searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => {
this.PartsValueNum = response.data[0].图号或者型号
})
this.dialogParts = true
} else {
this.title1 = '补充加工'
this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7)
searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => {
this.PartsValueNum = response.data[0].图号或者型号
})
this.dialogParts = true
}
this.dialogParts = true
} else {
update1(row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') {
this.fetchData()
}
})
}
},
searchMaterial1(row) {

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

@@ -7,7 +7,10 @@
v-for="item in contractNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{ item.name }}</div>
</el-option>
</el-select>
<el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/>
<!-- <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>-->
@@ -466,7 +469,8 @@ export default {
this.contractNum.push({
label: response.data[i].请购单编号,
value: response.data[i].请购单流水号,
id: response.data[i].请购类型
id: response.data[i].请购类型,
name: response.data[i].备注
})
}
})
@@ -585,7 +589,8 @@ export default {
this.contractNum.push({
label: response.data[i].请购单编号,
value: response.data[i].请购单流水号,
id: response.data[i].请购类型
id: response.data[i].请购类型,
name: response.data[i].备注
})
}
})