Skip to content

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

update

parent 7074fb76
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 13 deletions
src/views/education/ProducSchedule.vue
View file @ ff47d072
......@@ -145,9 +145,10 @@
</div>
</div>
</div>
<SchedulingPop :typePop='type' :data='editData' v-if="popShow"></SchedulingPop>
<SchedulingPop :typePop='type' :data='editData' v-if="popShow" @openRelate="openRelate" ></SchedulingPop>
<deletePop ref="delete" :deletetext="deletetext" v-if="deleteShow" :pathE="pathE" :type="typeV"></deletePop>
<div v-if="popShow || deleteShow" class="box"></div>
<relate-dialog v-if="relateShow" @closeDialog="closeDialog" />
</div>
</template>
......@@ -155,11 +156,14 @@
import Head from './component/head.vue'
import deletePop from './component/deletePop'
import SchedulingPop from './component/SchedulingPop'
import relateDialog from './component/relateDialog'
export default {
components:{
Head,
SchedulingPop,
deletePop
deletePop,
relateDialog
},
data() {
return {
......@@ -184,6 +188,7 @@ export default {
editData:[],
typeV:'',
pathE:'',
relateShow: false,
}
},
created(){
......@@ -226,6 +231,13 @@ export default {
console.log('err',err)
})
},
openRelate () {
this.relateShow = true
},
closeDialog () {
this.relateShow = false
},
//添加接口
addFun2(data){
this.$axios({
......
src/views/education/ProductionPlan.vue
View file @ ff47d072
......@@ -110,9 +110,10 @@
</div>
</div>
</div>
<LinePop :typePop='type' :tData="tData" :data="itemdata" type="6" v-if="popShow"></LinePop>
<LinePop :typePop='type' :tData="tData" :data="itemdata" type="6" v-if="popShow" @openRelate="openRelate" ></LinePop>
<deletePop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></deletePop>
<div v-if="popShow || deleteShow" class="box"></div>
<relate-dialog v-if="relateShow" @closeDialog="closeDialog" />
</div>
</template>
......@@ -120,11 +121,14 @@
import Head from './component/head.vue'
import LinePop from './component/linePop'
import deletePop from './component/deletePop'
import relateDialog from './component/relateDialog'
export default {
components:{
Head,
LinePop,
deletePop
deletePop,
relateDialog
},
data() {
return {
......@@ -147,7 +151,8 @@ export default {
deleteRowData:[],
deleteManyData:[],
typeV:'',
tData:[]
tData:[],
relateShow: false
}
},
props:[],
......@@ -185,6 +190,13 @@ export default {
console.log('err',err)
})
},
openRelate () {
this.relateShow = true
},
closeDialog () {
this.relateShow = false
},
//查询产品
queryProduct(){
var value = ''
......
src/views/education/component/SchedulingPop.vue
View file @ ff47d072
......@@ -68,9 +68,7 @@
<div class="centen_row" style="margin-top:10px">
<span class="centen_row_text" >线体状态信号:</span>
<!-- <div class="centen_row_select">
<el-input @change="numFun()" v-model="num" placeholder="请输入内容"></el-input>
</div> -->
<span @click="openRelate" class="relateBtn" >。 。 。</span>
</div>
</div>
......@@ -176,6 +174,10 @@ export default {
console.log('err',err)
})
},
openRelate () {
this.$emit('openRelate')
},
//订单选择
orderFun(){
this.num = 0
......@@ -367,6 +369,25 @@ export default {
height:480px;
width:100%;
background: #EEEEEE;
.relateBtn {
width: 75px;
height: 40px;
display: inline-block;
margin-left: 32px;
text-align: center;
line-height: 40px;
cursor: pointer;
user-select: none;
background:rgba(255,255,255,1);
border:1px solid rgba(37,92,193,1);
border-radius:4px;
box-sizing: border-box;
font-size:14px;
font-family:Microsoft YaHei;
font-weight:400;
color:rgba(51,51,51,1);
margin-right: 20px;
}
.popCenten{
width:737px;
height:380px;
......
src/views/education/component/linePop.vue
View file @ ff47d072
......@@ -23,11 +23,12 @@
</div>
<div v-if="type == 6" class="name">
<span>生产计划编号：</span>
<input v-model="planNo" class="nameipt" />
<span @click="openRelate" class="relateBtn plan_relateBtn" >。 。 。</span>
<input v-model="planNo" class="nameipt planName" />
</div>
<div v-if="type == 6" style="margin-top: 20px" class="name">
<span>产品编号：</span>
<el-select class="apply" v-model="producV" clearable placeholder="请选择">
<el-select class="apply planName" v-model="producV" clearable placeholder="请选择">
<el-option
v-for="item in productions"
:key="item.name"
......@@ -103,11 +104,13 @@
<div v-if="type == 6" class="name2" style="margin:15px auto">
<span>计划数量：</span>
<input @change="dNumFun()" style="width:460px;height:40px;margin-left:46px" v-model="dNum" type="text"/>
<span @click="openRelate" class="relateBtn plan_relateBtn" >。 。 。</span>
<input @change="dNumFun()" class="planName" style="width:460px;height:40px;margin-left:46px" v-model="dNum" type="text"/>
</div>
<div v-if="type == 6" class="name2" style="margin:15px auto">
<span style="float:left;display:block">计划交货日期: </span>
<div style="float:left;width:461px;height:40px;margin-left: 25px">
<span @click="openRelate" class="relateBtn plan_relateBtn" >。 。 。</span>
<div class="planName" style="float:left;width:461px;height:40px;margin-left: 25px">
<el-date-picker
v-model="dtatime"
type="datetime"
......@@ -115,8 +118,9 @@
</el-date-picker>
</div>
</div>
<div v-if="type == 6" class="name2" style="margin-top:20px">
<div v-if="type == 6" class="name2" style="margin-top: 70px">
<span>交货日期临近报警：</span>
<span @click="openRelate" class="relateBtn" style="margin-left: 20px">。 。 。</span>
</div>
<div v-if="type==3" class="namebtn">
<span>选择所包含的工序：</span>
......@@ -201,6 +205,7 @@ export default {
lineValue:'',
editDataArr:[],
istech:false,//适用工艺
planNo: ''
}
},
directives: {
......@@ -793,6 +798,14 @@ export default {
}
}
.planName {
width: 360px !important;
margin-right: 25px;
}
.plan_relateBtn {
float: right ;
margin: 0;
}
.namebtn{
width: 70%;
height: 40px;
......
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