Skip to content

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

update

parent a7296fd4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 9 deletions
src/views/education/component/StoreDialog.vue
View file @ 896c3b7a
<!--
* @Description: 这是***页面（组件）
* @Date: 2020-08-10 15:29:17
* @Author: Tao
* @LastEditors: Tao
* @LastEditTime: 2020-09-01 17:21:50
-->
<template>
<div class="dialog-mask">
<div class="scPopBox">
<div v-drag class="head">{{titleText}}
<div @click="close()" class="headImg"></div>
......@@ -54,6 +48,7 @@
</div>
</div>
</div>
</div>
</template>
<script>
......@@ -129,6 +124,17 @@ export default {
}
</script>
<style lang="scss">
.dialog-mask {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
z-index: 9;
}
.scPopBox{
.el-select{
width:310px;
......
src/views/education/component/linePop.vue
View file @ 896c3b7a
This diff is collapsed.
src/views/education/component/relateDialog.vue 0 → 100644
View file @ 896c3b7a
<template>
<div class="innerDialog-mask">
<div class="scPopBox">
<div v-drag class="head">{{titleText}}
<div @click="close()" class="headImg"></div>
</div>
<div class="popCenten_box">
<div class="popCenten">
<div class="centen_row" style="margin-top: 10px" >
<span class="centen_row_text" style="margin-left: 30px" >线体编号:</span>
<div class="centen_row_select">
<el-select v-model="value" placeholder="请选择">
<el-option
v-for="item in planList"
:key="item.PlanType"
:label="item.PlanType"
:value="item.PlanType">
</el-option>
</el-select>
</div>
</div>
<div class="centen_row" style="margin-top:10px">
<span class="centen_row_text" style="margin-left: 30px" >物料编号:</span>
<div class="centen_row_select">
<el-select v-model="value1" placeholder="请选择">
<el-option
v-for="item in materList"
:key="item.LineName"
:label="item.LineName"
:value="item.LineName">
</el-option>
</el-select>
</div>
</div>
<div class="centen_row" style="margin-top:10px">
<span class="centen_row_text" style="margin-left: 30px" >入库数量:</span>
<div class="centen_row_select">
<el-input @change="numFun()" v-model="count" placeholder="请输入入库数量"></el-input>
</div>
</div>
</div>
<div class="btn">
<div @click="close()" class="cancle">取消</div>
<div @click="conserve()" class="add">保存</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
count: '',
value: '',
value1 : '',
planList: [],
materList: []
}
},
props: {
titleText: {
type: String,
default: '选择变量'
}
},
directives: {
drag: function(el) {
let dragBox = el; //获取当前元素
dragBox.onmousedown = e => {
let box = document.querySelector('.scPopBox')
//算出鼠标相对元素的位置
let disX = e.clientX - dragBox.offsetLeft;
let disY = e.clientY - dragBox.offsetTop;
document.onmousemove = e => {
//用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
let left = e.clientX - (Number(disX));
let top = e.clientY - (Number(disY));
//移动当前元素
box.style.left = left + "px";
box.style.top = top + "px";
};
document.onmouseup = e => {
document.onmousemove = null;
document.onmouseup = null;
};
};
}
},
methods:{
// guid() {
// return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
// var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
// return v.toString(16);
// });
// },
close(){
this.count = ''
this.value = ''
this.value1 = ''
this.$emit('closeDialog')
},
numFun(){
this.count = parseInt(this.count)
if(String(this.count) == 'NaN'){
this.count = ''
}
},
conserve () {
var dialogData = {
count: this.count,
value: this.value,
value1 : this.value1,
}
this.$emit('conserve', dialogData)
}
}
}
</script>
<style lang="scss">
.innerDialog-mask {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
z-index: 29;
}
.scPopBox{
.el-select{
width:310px;
}
.el-date-editor.el-input, .el-date-editor.el-input__inner{
width:310px;
}
}
</style>
<style lang="scss" scoped>
.scPopBox{
width:820px;
height:550px;
background:rgba(238,238,238,1);
box-shadow:-7px 7px 50px 0px rgba(51,51,51,0.5);
position: absolute;
top: 0px;
left: 0px;
right: 0;
bottom: 0;
margin:auto;
z-index: 10;
.head{
position: relative;
line-height: 60px;
text-align: center;
width:820px;
height:60px;
background:rgba(37,92,193,1);
font-size:18px;
font-family:Microsoft YaHei;
font-weight:bold;
color:rgba(238,238,238,1);
user-select: none;
}
.headImg{
position: absolute;
right: 12px;
top: 12px;
width:36px;
height: 36px;
background:url('../../../assets/images/no.png') ;
background-size:cover ;
cursor: pointer;
}
.popCenten_box{
height:480px;
width:100%;
background: #EEEEEE;
.popCenten{
width:737px;
height:380px;
background: #fff;
margin-top:30px;
margin-left:30px;
padding-top:42px;
.centen_row{
width: 60%;
margin: auto;
height: 40px;
line-height: 40px;
}
.centen_row_text{
float: left;
}
.centen_row_select{
float: right;
width: 310px;
height: 40px;
}
}
}
.btn{
width:100%;
height: 40px;
overflow: hidden;
margin:20px 0 0 280px;
.cancle{
width: 160px;
height: 40px;
float: left;
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;
}
.add{
width: 160px;
height: 40px;
float: left;
text-align: center;
line-height: 40px;
cursor: pointer;
user-select: none;
background:rgba(37,92,193,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(255,255,255,1);
}
}
}
</style>
\ No newline at end of file
src/views/education/deviceManage.vue
View file @ 896c3b7a
......@@ -93,9 +93,10 @@
</div>
</div>
<!-- 弹窗内容 -->
<LinePop :typePop='type' :tData="tData" :tData2="tData2" :data="itemdata" type="7" v-if="popShow"></LinePop>
<LinePop :typePop='type' :tData="tData" :tData2="tData2" :data="itemdata" type="7" 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>
......@@ -103,16 +104,20 @@
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 {
tableData: [],
AllTableData:[],
relateShow: false,
ss:'',
num:1,
TotalCount:1,
......@@ -166,6 +171,13 @@ export default {
console.log('err',err)
})
},
openRelate () {
this.relateShow = true
},
closeDialog () {
this.relateShow = false
},
//查询添加工序
queryWord(){
var value = ''
......
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