Skip to content

T
tianjin
Commit 6fb76f6c authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent 5d38899c
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 44 deletions
src/views/education/ManageList.vue
View file @ 6fb76f6c
......@@ -123,8 +123,8 @@ export default {
name: ''
},
{
id: '生产计划编号',
name: '生产计划编号'
id: '生产排程编号',
name: '生产排程编号'
},
{
id: '产品编号',
......@@ -138,17 +138,21 @@ export default {
id: '产品描述',
name: '产品描述'
},
{
id: '单位',
name: '单位'
},
{
id: '计划交货日期',
name: '计划交货日期'
},
{
id: '实际完工日期',
name: '实际完工日期'
id: '实际开工日期',
name: '实际开工日期'
},
{
id: '生产计划状态',
name: '生产计划状态'
id: '实际完工日期',
name: '实际完工日期'
},
],
deletetext: '',
......@@ -182,6 +186,7 @@ export default {
this.AllTableData = res.data.data.map(item => ({
...item,
DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
StartDt: item.StartDt ? this.$moment(item.StartDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
EndDt: item.EndDt ? this.$moment(item.EndDt ).format('YYYY-MM-DD HH:mm:ss') : ' '
}))
// 克隆一份tableData数据
......
src/views/education/ProducSchedule.vue
View file @ 6fb76f6c
......@@ -69,7 +69,7 @@
label="计划交货日期"
:show-overflow-tooltip="true"
prop="DeliveryDt"
width="140">
width="180">
</el-table-column>
<el-table-column
label="排程数量"
......@@ -93,7 +93,7 @@
label="操作员"
:show-overflow-tooltip="true"
prop="UserName"
width="80">
width="150">
</el-table-column>
<el-table-column
label="生产排程状态"
......@@ -268,12 +268,7 @@ export default {
this.cancelFun()
}
this.deletetext = res.data.msg
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
var postData = this.resetData()
$this.query(postData)
}).catch(function(err){
console.log('err',err)
......@@ -283,6 +278,12 @@ export default {
//添加
addFun(value){
let data = value
if (value.LinVar.trim() === '') {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '请先关联变量'
return
}
this.$axios({
method:"post",
url:`/api/Schedule/Schedule_CheckWindowSave`,//检验是否可添加
......@@ -319,17 +320,20 @@ export default {
this.cancelFun()
}
this.deletetext = res.data.msg
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
var postData = this.resetData()
$this.query(postData)
}).catch(function(err){
console.log('err',err)
})
},
resetData () {
return {
argKeyWord: this.$refs.head.input,
argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
//查询值
textFun(text){
......@@ -516,13 +520,8 @@ export default {
method:"post",
url:`/api/Schedule/Schedule_Stop?argID=${argID}`,
}).then((res)=>{
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
var postData = this.resetData()
$this.query(postData)
this.pageFun(this.PageIndex)
})
},
......@@ -602,13 +601,8 @@ export default {
method:"post",
url:`/api/Schedule/Schedule_Download?argID=${argID}`,
}).then((res)=>{
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
var postData = this.resetData()
$this.query(postData)
this.pageFun(this.PageIndex)
}).catch(function(err){
console.log('err',err)
......@@ -673,12 +667,7 @@ export default {
method:"post",
url:`/api/Schedule/Schedule_Move?argID1=${id1}&&argID2=${id2}`,
}).then((res)=>{
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
var postData = this.resetData()
$this.query(postData)
}).catch((err) =>{
this.typeV = '7'
......
src/views/education/component/linePop.vue
View file @ 6fb76f6c
......@@ -22,11 +22,27 @@
<span>{{name}}编号：</span>
<input v-model="DevNuber" class="nameipt" />
</div>
<div v-if="type === '2'" class="name" style="margin-top:10px">
<span>{{name}}编号：</span>
<input v-model="CellNuber" class="nameipt" />
</div>
<div v-if="type === '3'" class="name" style="margin-top: -15px">
<span>{{name}}编号：</span>
<input v-model="Nuber" class="nameipt" />
</div>
<div v-if="type != 6" class="name" style="margin-top:10px">
<span>{{name}}名称：</span>
<input v-model="nameV" class="nameipt" />
</div>
<div v-if="type ==='3'" class="name" style="margin-top:10px">
<span>{{name}}描述：</span>
<input v-model="Desc" class="nameipt" />
</div>
<div v-if="type == 6" class="name">
<span>生产计划编号：</span>
<span @click="openRelate('VPID')" class="relateBtn plan_relateBtn" >选 择</span>
......@@ -208,6 +224,8 @@ export default {
numberV2:'',//编号2
modelV:'',//型号
describeV:'',//描述
Nuber: '',
Desc: '',
prodescribe: '', //type === 5 产品描述
prounit: '', //type ===5 单位
// num:1, //数量
......@@ -457,6 +475,8 @@ export default {
this.DevNuber = this.data.DevNuber
this.workValue = this.data.CellName
this.CellNuber = this.data.CellNuber
this.Nuber = this.data.Nuber
this.Desc = this.data.Desc
this.Company = this.data.Company
this.lineValue = this.data.LineName
this.numberV = this.data.MID
......@@ -533,6 +553,8 @@ export default {
}else if(this.type==3){
this.valuedata={
Name:this.nameV,
Nuber: this.Nuber,
Desc: this.Desc,
data:this.tableDataList
}
}else if(this.type==5){
......@@ -892,8 +914,8 @@ export default {
margin: auto;
line-height: 40px;
overflow: hidden;
margin-top:35px;
margin-bottom:22px;
margin-top: 18px;
margin-bottom:18px;
}
.conterFool_middle{
width: 70%;
......
src/views/education/technology.vue
View file @ 6fb76f6c
......@@ -68,7 +68,8 @@
<el-table-column
label="操作"
show-overflow-tooltip>
show-overflow-tooltip
width="180">
<template slot-scope="scope">
<div class="table_edit" @click="editFun(scope.row)" >
<div class="edit_img"></div>
......@@ -195,6 +196,8 @@ export default {
ID:value.ID,
Name:value.Name,
CellList:'',
Nuber: value.Nuber,
Desc: value.Desc,
UpdateUserName:value.UpdateUserName,
UpdateTime:value.CreateTime,
Cells:[],
......@@ -234,6 +237,8 @@ export default {
ID:value.ID,
Name:value.Name,
CellList:'',
Nuber: value.Nuber,
Desc: value.Desc,
UpdateUserName:value.UpdateUserName,
UpdateTime:value.CreateTime,
Cells:[],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment