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-06-15 17:24:34 +08:00
parent c1f58eeeb2
commit e328fb0c54
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

34
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -90,7 +90,7 @@
</template>
<script>
import { searchtable, searchtable2, change, handlechange, searchtable3, change2, handlechange2, change3 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { searchtable, searchtable2, searchtable3, change2, change3 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -143,7 +143,7 @@ export default {
this.bianliang1.push(this.arrest2[i].工艺计划流水号)
this.bianliang2.push(this.arrest2[i].工序流水号)
}
change3(this.bianliang2, '0000', this.bianliang1).then(response => {
change3(this.bianliang2, this.userId, this.bianliang1).then(response => {
this.searchTable()
})
}
@@ -190,20 +190,20 @@ export default {
return i
}
},
// 自家备料确认
handleChange1(row) {
var date = new Date()
var month = this.zeroFill(date.getMonth() + 1)
var day = this.zeroFill(date.getDate())
this.editTime = date.getFullYear() + '-' + month + '-' + day
change(row.工艺计划流水号, row.重量, row.单价).then(() => {
handlechange(row.工序流水号, '0000').then(response => {
handlechange2(row.工序流水号, this.editTime).then(response => {
this.searchTable()
})
})
})
},
// // 自家备料确认
// handleChange1(row) {
// var date = new Date()
// var month = this.zeroFill(date.getMonth() + 1)
// var day = this.zeroFill(date.getDate())
// this.editTime = date.getFullYear() + '-' + month + '-' + day
// change(row.工艺计划流水号, row.重量, row.单价).then(() => {
// handlechange(row.工序流水号, this.userId).then(response => {
// handlechange2(row.工序流水号, this.editTime).then(response => {
// this.searchTable()
// })
// })
// })
// },
handleSelectionChange(val) {
this.arrest = val
},
@@ -250,7 +250,7 @@ export default {
this.bianliang1.push(this.arrest[i].工艺计划流水号)
this.bianliang2.push(this.arrest[i].工序流水号)
}
change2(this.bianliang2, '0000', this.bianliang1).then(response => {
change2(this.bianliang2, this.userId, this.bianliang1).then(response => {
this.searchTable2()
})
}

3
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -519,9 +519,6 @@ export default {
this.process[i][k] = response.data[k].工艺名称简称
this.planDate[i][k] = response.data[k].计划日期_短
this.realDate[i][k] = response.data[k].完成日期_短
if (response.data[k].工艺编号 === 29) {
response.data[k].员工姓名 = '备料'
}
if (response.data[k].工序间是否外协 === 2) {
response.data[k].员工姓名 = '外协'
}

10
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -5,12 +5,9 @@
<span>表单号:</span>
<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
<span>外协厂家:</span>
<el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:250px" clearable>
<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=0"/>
</el-input>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
<span>下达任务日期:</span>
<el-date-picker
v-model="time"
<el-date-picker0
type="date"
size="small"
placeholder="选择日期"/>
@@ -639,7 +636,7 @@ export default {
}
this.List = []
this.List3 = []
getTable(this.num, this.formNumber, this.num1, this.ManufactorNumber, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
this.total = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].任务下达日期 !== null) {
@@ -890,7 +887,6 @@ export default {
handleCurrentChange3(row) {
if (this.param === 0) {
this.name1 = row.外协厂家名称
this.ManufactorNumber = row.外协厂家流水号
} else {
this.form.外协厂家 = row.外协厂家名称
this.ManufactorNumber1 = row.外协厂家流水号