Skip to content

M
mes-ui
Commit 99159c18 authored by kangzhenfei's avatar kangzhenfei
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

parents 4e51f204 7566c7da
Hide whitespace changes
Inline Side-by-side
Showing with 1170 additions and 812 deletions
assets/css/base.less
View file @ 99159c18
html body { html body {
min-width: 1240px; min-width: 1240px;
} }
.__nuxt-error-page { .__nuxt-error-page {
.title { .title {
font-size: 16px; font-size: 16px;
} }
} }
#__nuxt, #__nuxt,
#__layout { #__layout {
height: 100% height: 100%
} }
ul,li{
list-style: none; ul,
li {
list-style: none;
} }
div::-webkit-scrollbar{
width:10px; div::-webkit-scrollbar {
height:10px; width: 10px;
/**/ height: 10px;
} /**/
div::-webkit-scrollbar-track{ }
background: rgb(239, 239, 239);
border-radius:2px; div::-webkit-scrollbar-track {
} background: rgb(239, 239, 239);
div::-webkit-scrollbar-thumb{ border-radius: 2px;
background:rgba(38,128,235,0.5); }
border-radius:10px;
} div::-webkit-scrollbar-thumb {
div::-webkit-scrollbar-thumb:hover{ background: rgba(38, 128, 235, 0.5);
background: rgba(38,128,235,0.8); border-radius: 10px;
} }
div::-webkit-scrollbar-corner{
background: rgba(38,128,235,1); div::-webkit-scrollbar-thumb:hover {
} background: rgba(38, 128, 235, 0.8);
}
div::-webkit-scrollbar-corner {
background: rgba(38, 128, 235, 1);
}
/*flex*/ /*flex*/
.flex{ .flex {
display: flex; display: flex;
//采用flex布局 //采用flex布局
} }
.fc-m{
justify-content: center; .fc-m {
justify-content: center;
} }
.fa-m{
align-items: center; .fa-m {
align-items: center;
} }
.fc-e{
justify-content: flex-end; .fc-e {
justify-content: flex-end;
} }
.fc-b{
justify-content: space-between; .fc-b {
justify-content: space-between;
} }
.fc-a{
justify-content: space-around; .fc-a {
justify-content: space-around;
} }
.fc-ev{
justify-content: space-evenly; .fc-ev {
justify-content: space-evenly;
} }
.fd{
flex-direction: column; .fd {
flex-direction: column;
} }
.fg{
flex-grow: 1; .fg {
flex-grow: 1;
} }
.fs{
flex-shrink: 0; .fs {
flex-shrink: 0;
} }
.fg2{
flex-grow: 2; .fg2 {
flex-grow: 2;
} }
.fos{
order: -1; .fos {
order: -1;
} }
.foe{
order: 99; .foe {
order: 99;
} }
/*字体*/ /*字体*/
.ib { .ib {
display: inline; display: inline;
} }
.f14 { .f14 {
font-size: 14px; font-size: 14px;
} }
.f16 { .f16 {
font-size: 16px; font-size: 16px;
} }
.f18 { .f18 {
font-size: 18px; font-size: 18px;
} }
.f20 { .f20 {
font-size: 20px; font-size: 20px;
} }
.f24 { .f24 {
font-size: 24px; font-size: 24px;
} }
// 字体加粗 // 字体加粗
.fw5 { .fw5 {
font-weight: 500; font-weight: 500;
} }
.fwBold { .fwBold {
font-weight: bold; font-weight: bold;
} }
.ico:hover { .ico:hover {
color: #f23a3a; color: #f23a3a;
cursor: pointer; cursor: pointer;
} }
.stitle{
height: 40px; .stitle {
background-color: #F5F6FA; height: 40px;
line-height: 40px; background-color: #F5F6FA;
line-height: 40px;
} }
//行高 //行高
.lh10 { .lh10 {
line-height: 10px line-height: 10px
} }
.lh15 { .lh15 {
line-height: 15px line-height: 15px
} }
.lh20 { .lh20 {
line-height: 20px line-height: 20px
} }
.lh25 { .lh25 {
line-height: 25px line-height: 25px
} }
.lh30 { .lh30 {
line-height: 30px line-height: 30px
} }
.lh40 { .lh40 {
line-height: 40px line-height: 40px
} }
.lh50 { .lh50 {
line-height: 50px line-height: 50px
} }
/*边距*/ /*边距*/
.m10 { .m10 {
margin: 10px; margin: 10px;
} }
.mt4 { .mt4 {
margin-top: 4px; margin-top: 4px;
} }
.mt5 { .mt5 {
margin-top: 5px; margin-top: 5px;
} }
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
.mt15 { .mt15 {
margin-top: 15px; margin-top: 15px;
} }
.mt20 { .mt20 {
margin-top: 20px; margin-top: 20px;
} }
.mt30 { .mt30 {
margin-top: 30px; margin-top: 30px;
} }
.mt50 { .mt50 {
margin-top: 50px; margin-top: 50px;
} }
.mb0 { .mb0 {
margin-bottom: 0px; margin-bottom: 0px;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
.mb15 { .mb15 {
margin-bottom: 15px; margin-bottom: 15px;
} }
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
.ml0 { .ml0 {
margin-left: 0; margin-left: 0;
} }
.ml5 { .ml5 {
margin-left: 5px; margin-left: 5px;
} }
.ml10 { .ml10 {
margin-left: 10px; margin-left: 10px;
} }
.ml15 { .ml15 {
margin-left: 15px; margin-left: 15px;
} }
.ml20 { .ml20 {
margin-left: 20px; margin-left: 20px;
} }
.ml30 { .ml30 {
margin-left: 30px; margin-left: 30px;
} }
.ml110 { .ml110 {
margin-left: 110px; margin-left: 110px;
} }
.mr0 { .mr0 {
margin-right: 0px; margin-right: 0px;
} }
.mr5 { .mr5 {
margin-right: 5px; margin-right: 5px;
} }
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
.mr15 { .mr15 {
margin-right: 15px; margin-right: 15px;
} }
.mr20 { .mr20 {
margin-right: 20px; margin-right: 20px;
} }
.mr30 { .mr30 {
margin-right: 30px; margin-right: 30px;
} }
.mtb10 { .mtb10 {
margin: 10px 0; margin: 10px 0;
} }
.m15{
margin: 15px; .m15 {
margin: 15px;
} }
/*内边距*/ /*内边距*/
.ptb10 { .ptb10 {
padding: 10px 0px; padding: 10px 0px;
} }
.pd5 { .pd5 {
padding: 5px; padding: 5px;
} }
.pt10 { .pt10 {
padding: 10px 0px 0; padding: 10px 0px 0;
} }
.ptb5 { .ptb5 {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
.pd10 { .pd10 {
padding: 10px; padding: 10px;
} }
.p10 { .p10 {
padding: 10px; padding: 10px;
} }
.p20 { .p20 {
padding: 20px; padding: 20px;
} }
.pl30 { .pl30 {
padding-left: 30px padding-left: 30px
} }
.pl5 { .pl5 {
padding-left: 5px padding-left: 5px
} }
.pl10 { .pl10 {
padding-left: 10px padding-left: 10px
} }
.pl20 { .pl20 {
padding-left: 20px padding-left: 20px
} }
.pt15 { .pt15 {
padding-top: 15px padding-top: 15px
} }
.bnone { .bnone {
border: none; border: none;
} }
.marnone { .marnone {
margin: 0; margin: 0;
} }
.hide { .hide {
display: none; display: none;
} }
.show { .show {
display: block; display: block;
} }
.hidden { .hidden {
overflow: hidden; overflow: hidden;
} }
.zh-scroll-y { .zh-scroll-y {
overflow-y: scroll; overflow-y: scroll;
} }
.h-stack { .h-stack {
overflow: visible overflow: visible
} }
.zh-ellip { .zh-ellip {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
// 字体位置 // 字体位置
.ver-m { .ver-m {
vertical-align: middle; vertical-align: middle;
} }
/*栅格化*/ /*栅格化*/
.col-xs6 .col-4 { .col-xs6 .col-4 {
width: 25%; width: 25%;
display: inline-block; display: inline-block;
} }
.col-3 { .col-3 {
width: 33.33333%; width: 33.33333%;
display: inline-block; display: inline-block;
} }
/*宽度*/ /*宽度*/
.w50 { .w50 {
width: 50px width: 50px
} }
.w80 { .w80 {
width: 80px width: 80px
} }
.w100 { .w100 {
width: 100px width: 100px
} }
.w120 { .w120 {
width: 120px width: 120px
} }
.w160 { .w160 {
width: 160px width: 160px
} }
.w180 { .w180 {
width: 180px width: 180px
} }
.w200 { .w200 {
width: 200px width: 200px
} }
.w240 { .w240 {
width: 240px width: 240px
} }
.w270 { .w270 {
width: 270px; width: 270px;
} }
.w300 { .w300 {
width: 300px; width: 300px;
} }
.w800 { .w800 {
width: 800px; width: 800px;
} }
/*高度*/ /*高度*/
.h17 { .h17 {
height: 17px; height: 17px;
line-height: 17px; line-height: 17px;
} }
.h28 { .h28 {
height: 28px; height: 28px;
} }
.h36 { .h36 {
height: 36px; height: 36px;
} }
.h50 { .h50 {
height: 50px; height: 50px;
} }
.h200 { .h200 {
height: 200px; height: 200px;
} }
.h400 { .h400 {
height: 400px; height: 400px;
overflow: auto; overflow: auto;
} }
/*最小高度*/ /*最小高度*/
.minh300 { .minh300 {
min-height: 300px; min-height: 300px;
} }
.minh100 { .minh100 {
min-height: 100px; min-height: 100px;
} }
.minh200 { .minh200 {
min-height: 200px; min-height: 200px;
} }
/*最小宽度*/ /*最小宽度*/
.minW100 { .minW100 {
min-width: 100px min-width: 100px
} }
.minW140 { .minW140 {
min-width: 140px min-width: 140px
} }
.minW200 { .minW200 {
min-width: 200px min-width: 200px
} }
/*最大宽度*/ /*最大宽度*/
.maxW50 { .maxW50 {
max-width: 50px; max-width: 50px;
} }
.maxW80 { .maxW80 {
max-width: 80px; max-width: 80px;
} }
/*按钮*/ /*按钮*/
.button-box { .button-box {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
} }
.button-box-block { .button-box-block {
display: block; display: block;
text-align: center; text-align: center;
} }
.button-box-block .layui-btn, .button-box-block .layui-btn,
.button-box .layui-btn { .button-box .layui-btn {
min-width: 80px; min-width: 80px;
} }
.d-button { .d-button {
min-width: 55px; min-width: 55px;
height: 28px; height: 28px;
padding: 0 10px; padding: 0 10px;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size: 14px;
background: #e6e6e6; background: #e6e6e6;
color: #333; color: #333;
margin: 0 5px; margin: 0 5px;
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
cursor: pointer; cursor: pointer;
-webkit-transition: all .2s; -webkit-transition: all .2s;
-ms-transition: all .2s; -ms-transition: all .2s;
transition: all .2s; transition: all .2s;
} }
.d-button:active { .d-button:active {
transform: scale(.96); transform: scale(.96);
} }
/*按钮颜色*/ /*按钮颜色*/
.bluebg { .bluebg {
background: #237bdf; background: #237bdf;
color: #fff; color: #fff;
} }
.bluebg:hover { .bluebg:hover {
background: #0c79b1; background: #0c79b1;
} }
.redbg { .redbg {
background: #e2440a; background: #e2440a;
} }
.red { .red {
color: #f23a3a; color: #f23a3a;
} }
.redbg:hover { .redbg:hover {
background: #d7342e; background: #d7342e;
} }
.qingbg { .qingbg {
background: #169bd5; background: #169bd5;
color: #fff; color: #fff;
} }
.white { .white {
color: #fff; color: #fff;
} }
.qingbg:hover { .qingbg:hover {
background: #2f93bf; background: #2f93bf;
} }
.blue-tab { .blue-tab {
color: #1e9fff; color: #1e9fff;
} }
.blue-modal-text { .blue-modal-text {
color: #358deb; color: #358deb;
} }
.blue-dark { .blue-dark {
color: #0e2b55; color: #0e2b55;
} }
.blue-shadow { .blue-shadow {
color: #7eccfc; color: #7eccfc;
} }
.orangetext { .orangetext {
color: #fca509; color: #fca509;
} }
.orangebg { .orangebg {
background: #ff9900; background: #ff9900;
} }
.orangebg:hover { .orangebg:hover {
background: #e0690c; background: #e0690c;
} }
.greenbg { .greenbg {
background: #4f9536; background: #4f9536;
} }
.green { .green {
color: #4f9536 color: #4f9536
} }
.greenbg:hover { .greenbg:hover {
background: #4aaa4a; background: #4aaa4a;
} }
.darkblue { .darkblue {
background: #5eb95e background: #5eb95e
} }
.redbd { .redbd {
border: 1px dashed #f23a3a; border: 1px dashed #f23a3a;
color: #f23a3a; color: #f23a3a;
cursor: pointer; cursor: pointer;
} }
.greenbd { .greenbd {
border: 1px dashed #5eb95e; border: 1px dashed #5eb95e;
color: #5eb95e; color: #5eb95e;
} }
.new-blue { .new-blue {
color: #2786f2; color: #2786f2;
} }
.new-green { .new-green {
color: #5eae36; color: #5eae36;
} }
.new-red { .new-red {
color: #fe4b04; color: #fe4b04;
} }
.new-orange { .new-orange {
color: #ff9900; color: #ff9900;
} }
.blueTitle{
color: #2680EB; .blueTitle {
color: #2680EB;
} }
.grayTitle{
color: #333; .grayTitle {
color: #333;
} }
/*图标*/ /*图标*/
i.iconfont { i.iconfont {
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
i.iconfont:active { i.iconfont:active {
-webkit-transform: scale(.96); -webkit-transform: scale(.96);
-ms-transform: scale(.96); -ms-transform: scale(.96);
-o-transform: scale(.96); -o-transform: scale(.96);
transform: scale(.96); transform: scale(.96);
} }
...@@ -650,7 +679,7 @@ i.iconfont:active { ...@@ -650,7 +679,7 @@ i.iconfont:active {
i.icon-start, i.icon-start,
i.icon-yundown, i.icon-yundown,
i.icon-save { i.icon-save {
color: #1E9FFF color: #1E9FFF
} }
...@@ -658,699 +687,748 @@ i.icon-save { ...@@ -658,699 +687,748 @@ i.icon-save {
i.icon-tingzhi, i.icon-tingzhi,
i.icon-lajitong { i.icon-lajitong {
color: #FF5722 color: #FF5722
} }
/*青色图标*/ /*青色图标*/
i.icon-edit { i.icon-edit {
color: #518dd8 color: #518dd8
} }
i.icon-huanvar { i.icon-huanvar {
color: #4470a7; color: #4470a7;
font-size: 20px; font-size: 20px;
} }
i.icon-fault { i.icon-fault {
color: #f71a4b color: #f71a4b
} }
i.icon-yujing { i.icon-yujing {
color: #ff9906 color: #ff9906
} }
i.icon-dian { i.icon-dian {
opacity: .5 opacity: .5
} }
/*刷新按钮*/ /*刷新按钮*/
.ico-ratate { .ico-ratate {
animation-name: repRotate; animation-name: repRotate;
} }
i.icon-gengxin { i.icon-gengxin {
animation: linear .8s infinite; animation: linear .8s infinite;
} }
/*浮动*/ /*浮动*/
.fl { .fl {
float: left; float: left;
} }
.fr { .fr {
float: right float: right
} }
.fn { .fn {
float: none float: none
} }
.tl { .tl {
text-align: left; text-align: left;
} }
.tr { .tr {
text-align: right; text-align: right;
} }
.tc { .tc {
text-align: center; text-align: center;
} }
/*清除浮动*/ /*清除浮动*/
.clear { .clear {
clear: both; clear: both;
} }
/*块*/ /*块*/
.block { .block {
display: block; display: block;
} }
.inline { .inline {
display: inline-block; display: inline-block;
} }
.cursor { .cursor {
cursor: pointer; cursor: pointer;
} }
/* 定位 */ /* 定位 */
.pr { .pr {
position: relative; position: relative;
} }
.pa { .pa {
position: absolute position: absolute
} }
/* 展示框title */ /* 展示框title */
.show-title { .show-title {
background: #031019; background: #031019;
letter-spacing: 2px; letter-spacing: 2px;
color: #b6dff8; color: #b6dff8;
text-align: center; text-align: center;
} }
input::-webkit-input-placeholder, input::-webkit-input-placeholder,
select input::-webkit-input-placeholder, select input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
color: #7dbbfb; color: #7dbbfb;
} }
[v-cloak] { [v-cloak] {
display: none; display: none;
} }
// 纵横树的样式 // 纵横树的样式
.zh-tree { .zh-tree {
// position: relative; // position: relative;
display: block; display: block;
width: 250px; width: 250px;
float: left; float: left;
transform: translateX(0); transform: translateX(0);
transition: all .2s; transition: all .2s;
box-sizing: border-box; box-sizing: border-box;
border: #E4E6ED solid 1px; border: #E4E6ED solid 1px;
background: #fff; background: #fff;
padding: 0px 10px 20px 10px; padding: 0px 10px 20px 10px;
margin-top: 10px; margin-top: 10px;
.zh-title { .zh-title {
font-size: 14px; font-size: 14px;
padding: 0 5px; padding: 0 5px;
line-height: 45px; line-height: 45px;
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
border-bottom: #e4e6ed solid 1px; border-bottom: #e4e6ed solid 1px;
} }
.zh-box { .zh-box {
width: 100%; width: 100%;
height: 100%; height: 100%;
// overflow-y: auto; // overflow-y: auto;
padding: 15px; padding: 15px;
// margin-bottom: -5000px; // margin-bottom: -5000px;
// padding-bottom: 5000px; // padding-bottom: 5000px;
// .tree-content { // .tree-content {
// overflow-y: auto; // overflow-y: auto;
// } // }
} }
} }
// 纵横树右侧区域 // 纵横树右侧区域
.content-right { .content-right {
margin-left: 10px; margin-left: 10px;
width: calc(100% - 260px); width: calc(100% - 260px);
height: 100%; height: 100%;
float: left; float: left;
box-sizing: border-box; box-sizing: border-box;
transition: all .2s; transition: all .2s;
background: #fff; background: #fff;
// border-radius:3px; // border-radius:3px;
padding: 0px 10px 10px 0px; padding: 0px 10px 10px 0px;
margin-top: 10px; margin-top: 10px;
// box-shadow: 0 0 5px rgba(0, 0, 0, .15); // box-shadow: 0 0 5px rgba(0, 0, 0, .15);
} }
.contentRight { .contentRight {
width: calc(100%); width: calc(100%);
height: 100%; height: 100%;
float: left; float: left;
box-sizing: border-box; box-sizing: border-box;
transition: all .2s; transition: all .2s;
background: #fff; background: #fff;
// border-radius:3px; // border-radius:3px;
padding: 0px 10px 10px 0px; padding: 0px 10px 10px 0px;
margin-top: 10px; margin-top: 10px;
// box-shadow: 0 0 5px rgba(0, 0, 0, .15); // box-shadow: 0 0 5px rgba(0, 0, 0, .15);
} }
.topTitle { .topTitle {
height: 32px; height: 32px;
text-align: right; text-align: right;
} }
// .tableCommon { // .tableCommon {
// // border:none; // // border:none;
// } // }
.tableCommon tr th { .tableCommon tr th {
line-height: 30px; line-height: 30px;
font-size: 14px; font-size: 14px;
//text-align: center; //text-align: center;
// border:none; // border:none;
// border-bottom:#e4e6ed solid 1px; // border-bottom:#e4e6ed solid 1px;
background: #f5f6fa; background: #f5f6fa;
} }
.tableCommon .tableCommon tr th { .tableCommon .tableCommon tr th {
line-height: 24px; line-height: 24px;
font-size: 14px; font-size: 14px;
background: #EEEDF0; background: #EEEDF0;
} }
.tableCommon .tableCommon{
tr td { .tableCommon .tableCommon {
border: none; tr td {
border-bottom: 1px solid #E4E6ED; border: none;
padding: 0 2px; border-bottom: 1px solid #E4E6ED;
background: #F6F8FB;
}
}
.tableCommon tr td {
line-height: 25px;
font-size: 14px;
padding: 0 2px; padding: 0 2px;
background: #F6F8FB;
}
} }
.tableCommon tr td .ivu-table-cell {
padding:0 2px; .tableCommon tr td {
line-height: 25px;
font-size: 14px;
padding: 0 2px;
}
.tableCommon tr td .ivu-table-cell {
padding: 0 2px;
} }
.cellInfoTitle { .cellInfoTitle {
padding: 0 10px; padding: 0 10px;
text-align: right; text-align: right;
border: #E4E6ED solid 1px; border: #E4E6ED solid 1px;
background: #F5F6FA; background: #F5F6FA;
color: #515A6E; color: #515A6E;
font-weight: bold; font-weight: bold;
height: 35px; height: 35px;
line-height: 34px; line-height: 34px;
margin: -1px; margin: -1px;
} }
.cellInfoContent { .cellInfoContent {
padding: 0 10px; padding: 0 10px;
text-align: left; text-align: left;
border-top: #E4E6ED solid 1px; border-top: #E4E6ED solid 1px;
border-bottom: #E4E6ED solid 1px; border-bottom: #E4E6ED solid 1px;
border-right: #E4E6ED solid 1px; border-right: #E4E6ED solid 1px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
margin: -1px; margin: -1px;
} }
/* 三列合并内容 */ /* 三列合并内容 */
.cellInfoContent1 { .cellInfoContent1 {
padding: 0 10px; padding: 0 10px;
text-align: left; text-align: left;
border-top: #E4E6ED solid 1px; border-top: #E4E6ED solid 1px;
border-bottom: #E4E6ED solid 1px; border-bottom: #E4E6ED solid 1px;
border-right: #E4E6ED solid 1px; border-right: #E4E6ED solid 1px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
margin: -1px -5px; margin: -1px -5px;
} }
/* 右侧设置自定义显示列ico */ /* 右侧设置自定义显示列ico */
.divIco { .divIco {
border: #D0D2D9 solid 1px; border: #D0D2D9 solid 1px;
border-radius: 4px; border-radius: 4px;
height: 28px; height: 28px;
line-height: 24px; line-height: 24px;
width: 40px; width: 40px;
float: right; float: right;
text-align: center; text-align: center;
margin-left: 5px; margin-left: 5px;
} }
.divIco:hover { .divIco:hover {
background: #F5F6FA; background: #F5F6FA;
} }
.icoListInfo { .icoListInfo {
font-weight: bold; font-weight: bold;
color: #515A6E; color: #515A6E;
font-size: 24px; font-size: 24px;
} }
[type=reset], [type=reset],
[type=submit], [type=submit],
button, button,
html [type=button] { html [type=button] {
-webkit-appearance: button; -webkit-appearance: button;
} }
.waitTask {/*flex 布局*/ .waitTask {
display: flex!important; /*flex 布局*/
align-items: center; display: flex !important;
width: 200px; align-items: center;
height: 100px; width: 200px;
float: left; height: 100px;
margin-right: 10px; float: left;
word-break: break-word; margin-right: 10px;
word-break: break-word;
} }
.leftIco { .leftIco {
width: 60px; width: 60px;
float: left; float: left;
text-align: center; text-align: center;
} }
.bold { .bold {
font-weight: bold; font-weight: bold;
} }
.action { .action {
a { a {
color: #1890FF; //查看和其他 color: #1890FF; //查看和其他
span{
padding: 4px; span {
} padding: 4px;
i{
font-size: 16px;
padding: 4px;
border-radius: 3px;
}
i:hover{
background: #1890FF;
color: #fff;
}
background: transparent;
} }
a.detail{ i {
color: #1890FF; //查看和其他 font-size: 16px;
padding: 4px;
border-radius: 3px;
} }
a.add { i:hover {
color: #249E91; background: #1890FF;
color: #fff;
} }
// a.add:hover { background: transparent;
// // color: #27AB9D; }
// }
a.edit { a.detail {
// color: #32B187; color: #1890FF; //查看和其他
color: rgb(6, 147, 212) }
}
// a.edit:hover { a.add {
// color: #35BD90 color: #249E91;
// } }
a.remove,a.delete { // a.add:hover {
color: #FF7A8B; // // color: #27AB9D;
i:hover{ // }
background: #FF7A8B;
color: #fff; a.edit {
} // color: #32B187;
} color: rgb(6, 147, 212)
a.delete { }
color: #FF7A8B;
}
a.empower {
color: #FFBD59;
}
a.disable { // a.edit:hover {
color: #CAD1D9; // color: #35BD90
// }
a.remove,
a.delete {
color: #FF7A8B;
i:hover {
background: #FF7A8B;
color: #fff;
} }
}
a.delete {
color: #FF7A8B;
}
a.empower {
color: #FFBD59;
}
a.disable {
color: #CAD1D9;
}
a.icon { a.icon {
display: inline-block; display: inline-block;
width: 28px; width: 28px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
margin: 0px 0 0 -4px; margin: 0px 0 0 -4px;
border-radius: 50%; border-radius: 50%;
color: #515A6E; color: #515A6E;
background: #F5F6FA; background: #F5F6FA;
.ivu-icon { .ivu-icon {
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
}
} }
}
// a.icon:hover { // a.icon:hover {
// background: #27AB9D; // background: #27AB9D;
// color: #fff; // color: #fff;
// } // }
// a.icon:active { // a.icon:active {
// background: #229185; // background: #229185;
// color: #fff; // color: #fff;
// } // }
} }
.icon_box{
a.icon {
display: inline-grid;
width: 28px;
height: 28px;
line-height: 28px;
margin: 0;
.ivu-icon-ios-eye{
font-weight: bold;
font-size: 24px;
color: #249e91;
};
.ivu-icon-ios-cog{
font-weight: bold;
font-size: 24px;
color: #249e91;
}
.icon_box {
a.icon {
display: inline-grid;
width: 28px;
height: 28px;
line-height: 28px;
margin: 0;
.ivu-icon-ios-eye {
font-weight: bold;
font-size: 24px;
color: #249e91;
}
;
.ivu-icon-ios-cog {
font-weight: bold;
font-size: 24px;
color: #249e91;
} }
}
} }
.body-box { .body-box {
.bj-box { .bj-box {
position: relative; position: relative;
height: 45px; height: 45px;
.dan-hao,
.ri-qi,
.dao-chu {
position: absolute;
right: 10px;
width: 235px;
font-size: 14px;
color: #333;
font-weight: bold;
text-align: right;
}
.dao-chu {
top: 0px;
text-align: right;
}
.dan-hao {
top: 60px;
}
.ri-qi {
top: 95px;
}
}
.title-name { .dan-hao,
text-align: center; .ri-qi,
font-size: 28px; .dao-chu {
margin-bottom: 10px; position: absolute;
right: 10px;
width: 235px;
font-size: 14px;
color: #333;
font-weight: bold;
text-align: right;
} }
.js-title { .dao-chu {
text-align: center; top: 0px;
font-size: 20px; text-align: right;
font-weight: bold;
margin-bottom: 10px;
} }
.box-title { .dan-hao {
height: 45px; top: 60px;
line-height: 45px;
padding: 0 10px;
font-size: 14px;
color: #333;
border: 1px solid #d3d1d1;
} }
.box-dz { .ri-qi {
height: 40px; top: 95px;
line-height: 40px;
padding: 0 10px;
border-right: 1px solid #d3d1d1;
border-left: 1px solid #d3d1d1;
font-size: 14px;
font-weight: bold;
color: #333;
} }
} }
.zong-ji { .title-name {
text-align: center;
font-size: 28px;
margin-bottom: 10px;
}
.js-title {
text-align: center;
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
}
.box-title {
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
padding: 0 10px; padding: 0 10px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border: 1px solid #d3d1d1; border: 1px solid #d3d1d1;
border-top: none; }
display: flex;
.xiao-ji { .box-dz {
width: 202px; height: 40px;
border-right: 1px solid #d3d1d1; line-height: 40px;
} padding: 0 10px;
border-right: 1px solid #d3d1d1;
border-left: 1px solid #d3d1d1;
font-size: 14px;
font-weight: bold;
color: #333;
}
}
.da-xie { .zong-ji {
width: 70%; height: 45px;
padding-left: 15px; line-height: 45px;
font-weight: bold; padding: 0 10px;
} font-size: 14px;
color: #333;
border: 1px solid #d3d1d1;
border-top: none;
display: flex;
.xiao-ji {
width: 202px;
border-right: 1px solid #d3d1d1;
}
.xiao-xie { .da-xie {
padding-left: 15px; width: 70%;
font-weight: bold; padding-left: 15px;
} font-weight: bold;
}
.xiao-xie {
padding-left: 15px;
font-weight: bold;
}
} }
.bei-zhu { .bei-zhu {
font-size: 14px; font-size: 14px;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
margin-top: 10px; margin-top: 10px;
} }
.zhi-dan { .zhi-dan {
margin-top: 18px; margin-top: 18px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
} }
.selectBox{
div.ivu-select-dropdown{ .selectBox {
height: auto; div.ivu-select-dropdown {
} height: auto;
}
} }
.footers {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
text-align: center;
padding: 20px 0;
background: #d0d2d9;
div { .footers {
height: 25px; width: 100%;
font-size: 14px; position: fixed;
color: #333; bottom: 0;
line-height: 28px; left: 0;
text-align: center;
padding: 20px 0;
background: #d0d2d9;
div {
height: 25px;
font-size: 14px;
color: #333;
line-height: 28px;
} }
} }
.outPdf table, .outPdf table,
.outPdf table tr th, .outPdf table tr th,
.outPdf table tr td { .outPdf table tr td {
border: 1px solid #d3d1d1; border: 1px solid #d3d1d1;
padding: 0 3px; padding: 0 3px;
} }
.outPdf table { .outPdf table {
width: 100%; width: 100%;
line-height: 25px; line-height: 25px;
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
padding: 2px; padding: 2px;
} }
.outPdf table thead tr th { .outPdf table thead tr th {
line-height: 40px; line-height: 40px;
} }
.outP table, .outP table,
.outP table tr th, .outP table tr th,
.outP table tr td { .outP table tr td {
border: 1px solid #000000; border: 1px solid #000000;
padding: 0 3px; padding: 0 3px;
} }
.outP table { .outP table {
width: 100%; width: 100%;
line-height: 25px; line-height: 25px;
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
padding: 2px; padding: 2px;
} }
.outP table thead tr th { .outP table thead tr th {
line-height: 25px; line-height: 25px;
} }
//框架页面layout用
.full { //框架页面layout用
height: 100%; .full {
background: white; height: 100%;
margin-top: 45px; background: white;
.menu { margin-top: 45px;
border: 1px solid #ddd;
.menu {
border: 1px solid #ddd;
padding: 0 5px;
overflow: auto;
.title {
line-height: 45px;
font-size: 14px;
padding: 0 5px; padding: 0 5px;
overflow: auto; border-bottom: #e4e6ed solid 1px;
.title {
line-height: 45px; .fr {
font-size: 14px; float: right;
padding: 0 5px; margin-top: 10px;
border-bottom: #e4e6ed solid 1px; cursor: pointer;
.fr {
float: right;
margin-top: 10px;
cursor: pointer;
}
.fr:hover {
color: #249e91;
}
} }
.tree {
height: calc(100% - 150px); .fr:hover {
overflow: auto; color: #249e91;
} }
} }
.content {
background: white; .tree {
padding: 0 0 0 10px; height: calc(100% - 150px);
//position: absolute; overflow: auto;
left: 250px;
right: 10px;
.auto {
flex: 1;
overflow: auto;
position: relative;
min-height: 600px;
}
.fly {
position: relative;
overflow: inherit;
}
.ivu-btn-small {
padding: 0;
background: red;
}
} }
} }
//流程节点样式
.time {
font-size: 14px;
font-weight: bold;
}
.content { .content {
padding-left: 5px; background: white;
} padding: 0 0 0 10px;
.h100{ //position: absolute;
height: 100%; left: 250px;
} right: 10px;
//显示富文本框样式 .auto {
.detail .ivu-row .filed-col p .html p{ flex: 1;
margin: 0 10px 0 0; overflow: auto;
position: relative;
min-height: 600px;
}
.fly {
position: relative;
overflow: inherit;
}
.ivu-btn-small {
padding: 0;
background: red;
}
} }
}
//流程节点样式
.time {
font-size: 14px;
font-weight: bold;
}
.content {
padding-left: 5px;
}
.h100 {
height: 100%;
}
//显示富文本框样式
.detail .ivu-row .filed-col p .html p {
margin: 0 10px 0 0;
}
.con_bord { .con_bord {
margin: 10px 20px; margin: 10px 20px;
} }
.lay100 {
height: calc(100vh - 105px); .lay100 {
background-color: #f5f6fa; height: calc(100vh - 105px);
.con { background-color: #f5f6fa;
padding: 5px 5px 0px 10px;
} .con {
.con_bord { padding: 5px 5px 0px 10px;
margin: 10px 20px;
box-shadow: #c7c7c7 1px 2px 7px 3px;
}
background: rgba(245, 246, 250, 1);
} }
.menu_side{
background: #fff!important; .con_bord {
margin: 5px 0 0 0!important; margin: 10px 20px;
border: 1px solid #dcdee2!important; box-shadow: #c7c7c7 1px 2px 7px 3px;
}
background: rgba(245, 246, 250, 1);
} }
.show_menu{
.menu_side {
background: #fff !important;
margin: 5px 0 0 0 !important;
border: 1px solid #dcdee2 !important;
}
.show_menu {
width: 30px;
height: 30px;
position: fixed;
top: 100px;
left: 0;
z-index: 9;
.menu_play {
width: 30px; width: 30px;
height: 30px; height: 30px;
position: fixed; line-height: 34px;
top: 100px; font-size: 14px;
left: 0; text-align: center;
z-index: 9; color: #515A6E;
.menu_play{ border-top-right-radius: 5px;
width: 30px; border-bottom-right-radius: 5px;
height: 30px; background: #ffffff;
line-height: 34px; box-shadow: #ccc 2px 2px 4px 1px;
font-size: 14px; }
text-align: center;
color: #515A6E; .menu_play:hover {
border-top-right-radius: 5px; background-color: #2d8cf0;
border-bottom-right-radius: 5px; color: white;
background: #ffffff; }
box-shadow: #ccc 2px 2px 4px 1px;
}
.menu_play:hover{
background-color: #2d8cf0;
color: white;
}
} }
.details{
.ivu-input-number{ .details {
width: 100%; .ivu-input-number {
} width: 100%;
}
} }
//显示富文本框时的图片 //显示富文本框时的图片
.tohtml img{ .tohtml img {
max-width: 95%; max-width: 95%;
} }
\ No newline at end of file
.gdShow {
box-shadow: 0px 0px 15px #333;
}
components/page/dataGrid.vue
View file @ 99159c18
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
@on-drag-drop="onDragDrop" @on-drag-drop="onDragDrop"
@on-selection-change="selectionChange" @on-selection-change="selectionChange"
@on-select="onSelect" @on-select="onSelect"
:row-key="rowKey"
></Table> ></Table>
</div> </div>
<div class="table-footer"> <div class="table-footer">
...@@ -225,6 +226,10 @@ export default { ...@@ -225,6 +226,10 @@ export default {
span: {//栅格数 span: {//栅格数
type: Number, type: Number,
default: 24 default: 24
},
//table控件children子数据控制功能
rowKey: {
type: [String, Number]
}, },
gutter:{//间距 gutter:{//间距
type:Number, type:Number,
......
pages/materiel/classification/add.vue
View file @ 99159c18
...@@ -33,14 +33,25 @@ ...@@ -33,14 +33,25 @@
</Col> </Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
<Table border :columns="columns" :data="checkList" class="tableCommon" height="300"> <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input
v-if="row.fieldType==3"
v-model="row.title"
placeholder="请输入"
@on-blur="setRow(row,index)"
/>
</template>
<template slot-scope="{ row, index }" slot="note"> <template slot-scope="{ row, index }" slot="note">
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" /> <div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template> </template>
<template slot-scope="{ row, index }" slot="datatype"> <template slot-scope="{ row, index }" slot="datatype">
<!-- <Input v-model="row.datatype" placeholder="请输入" @on-blur="setRow(row,index)" /> --> <div v-if="row.fieldType==1">{{row.datatype}}</div>
<Select v-model="row.datatype" style="width:200px" @on-change="setRow(row,index)"> <Select v-model="row.datatype" v-else>
<Option <Option
v-for="item in cityList" @on-change="setRow(row,index)"
v-for="(item,index) in cityList"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
>{{ item.label }}</Option> >{{ item.label }}</Option>
...@@ -52,8 +63,15 @@ ...@@ -52,8 +63,15 @@
<template slot-scope="{ row, index }" slot="required"> <template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template slot-scope="{ row, index }" slot="isunique"> <template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isunique" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
</Col> </Col>
...@@ -79,6 +97,7 @@ export default { ...@@ -79,6 +97,7 @@ export default {
upId: 0, upId: 0,
code: 0 code: 0
}, },
cityList: [ cityList: [
{ {
value: "0", value: "0",
...@@ -112,7 +131,8 @@ export default { ...@@ -112,7 +131,8 @@ export default {
{ {
title: "属性名称", title: "属性名称",
key: "title", key: "title",
align: "center" align: "center",
slot: "title"
}, },
{ {
title: "备注", title: "备注",
...@@ -140,9 +160,15 @@ export default { ...@@ -140,9 +160,15 @@ export default {
}, },
{ {
title: "是否唯一属性", title: "是否唯一属性",
key: "isunique", key: "isUnique",
align: "center", align: "center",
slot: "isunique" slot: "isUnique"
},
{
title: "操作",
slot: "action",
width: 100,
align: "center"
} }
], ],
checkList: [], checkList: [],
...@@ -159,19 +185,47 @@ export default { ...@@ -159,19 +185,47 @@ export default {
}, },
methods: { methods: {
tableData() { tableData() {
let conditions = []; let conditions = [
{
conditionalType: "In",
fieldName: "fieldType",
fieldValue: "1,2"
},
{
conditionalType: "Equal",
fieldName: "categoryId",
fieldValue: "0"
}
];
Api.listTable({ conditions: conditions }).then(r => { Api.listTable({ conditions: conditions }).then(r => {
if (r.result) { if (r.result) {
console.log(r); var arr = r.result;
this.checkList = r.result; this.checkList = arr.filter(function(item) {
delete item["id"];
return item
});
} }
}); });
}, },
remove(index) {
this.checkList.splice(index, 1);
},
setRow() { setRow() {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() {}, addNew() {
let obj = {
title: "",
note: "",
datatype: "",
required: false,
isunique: false,
fieldType: 3,
categoryId: 0
};
this.checkList.push(obj);
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
......
pages/materiel/classification/edit.vue
View file @ 99159c18
...@@ -33,14 +33,25 @@ ...@@ -33,14 +33,25 @@
</Col> </Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
<Table border :columns="columns" :data="checkList" class="tableCommon" height="300"> <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input
v-if="row.fieldType==3"
v-model="row.title"
placeholder="请输入"
@on-blur="setRow(row,index)"
/>
</template>
<template slot-scope="{ row, index }" slot="note"> <template slot-scope="{ row, index }" slot="note">
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" /> <div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template> </template>
<template slot-scope="{ row, index }" slot="datatype"> <template slot-scope="{ row, index }" slot="datatype">
<!-- <Input v-model="row.datatype" placeholder="请输入" @on-blur="setRow(row,index)" /> --> <div v-if="row.fieldType==1">{{row.datatype}}</div>
<Select v-model="row.datatype" style="width:200px" @on-change="setRow(row,index)"> <Select v-model="row.datatype" v-else>
<Option <Option
v-for="item in cityList" @on-change="setRow(row,index)"
v-for="(item,index) in cityList"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
>{{ item.label }}</Option> >{{ item.label }}</Option>
...@@ -52,8 +63,15 @@ ...@@ -52,8 +63,15 @@
<template slot-scope="{ row, index }" slot="required"> <template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template slot-scope="{ row, index }" slot="isunique"> <template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isunique" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
</Col> </Col>
...@@ -73,6 +91,7 @@ ...@@ -73,6 +91,7 @@
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
props: ["nodeInfo"],
data() { data() {
return { return {
entity: { entity: {
...@@ -143,6 +162,12 @@ export default { ...@@ -143,6 +162,12 @@ export default {
key: "isunique", key: "isunique",
align: "center", align: "center",
slot: "isunique" slot: "isunique"
},
{
title: "操作",
slot: "action",
width: 100,
align: "center"
} }
], ],
checkList: [], checkList: [],
...@@ -151,13 +176,22 @@ export default { ...@@ -151,13 +176,22 @@ export default {
} }
}; };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
this.tableData(); this.tableData();
this.get();
}, },
methods: { methods: {
get() {
Api.get({ id: this.nodeInfo.id }).then(r => {
if (r.result) {
this.entity = r.result;
}
});
},
tableData() { tableData() {
let conditions = []; let conditions = [];
Api.listTable({ conditions: conditions }).then(r => { Api.listTable({ conditions: conditions }).then(r => {
...@@ -167,11 +201,24 @@ export default { ...@@ -167,11 +201,24 @@ export default {
} }
}); });
}, },
remove(index) {
this.checkList.splice(index, 1);
},
setRow() { setRow() {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() {}, addNew() {
let obj = {
title: "",
note: "",
datatype: "",
required: false,
isunique: false,
fieldType: 3,
categoryId: 0
};
this.checkList.push(obj);
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
......
pages/materiel/classification/index.vue
View file @ 99159c18
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<!-- <Product :parent="parent" /> --> <!-- <Product :parent="parent" /> -->
</Content> </Content>
</Layout> </Layout>
<Modal v-model="modal" :title="title" width="1000" footer-hide> <Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" :nodeInfo="nodeInfo" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" :nodeInfo="nodeInfo" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
......
pages/mesPlan/index.vue
View file @ 99159c18
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
@on-selection-change="onSelect" @on-selection-change="onSelect"
:batch="true" :batch="true"
:border="false" :border="false"
:rowKey="id" rowKey="id"
> >
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
......
pages/produce/execute/api.js
View file @ 99159c18
...@@ -13,4 +13,17 @@ export default { ...@@ -13,4 +13,17 @@ export default {
orderanddispatchinfos(params) { orderanddispatchinfos(params) {
return Api.get(`${PlanUrl}/orderexecutenew/orderanddispatchinfos`, params); return Api.get(`${PlanUrl}/orderexecutenew/orderanddispatchinfos`, params);
}, },
//工单开工
entrystart(params) {
return Api.post(`${PlanUrl}/orderexecute/entrystart`, params);
},
//工单暂停
entrypause(params) {
return Api.post(`${PlanUrl}/orderexecute/entrypause`, params);
},
//工单继续
entrentrycontinuestart(params) {
return Api.post(`${PlanUrl}/orderexecute/entrycontinue`, params);
},
} }
\ No newline at end of file
pages/produce/execute/components/orderlist.vue
View file @ 99159c18
<template> <template>
<div class="order_list"> <div class="order_list">
<div class="card_box"> <div class="card_box">
<Card class="card_order" v-for="(item,index) in listTasks" <Card
@click.native="goPage(item)" :key="index" class="card_order"
:class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3': v-for="(item,index) in listTasks"
:style="order==item.id?'box-shadow: 0px 0px 15px #333;':''"
@click.native="goPage(item)"
:key="index"
:class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3':
(item.status==7?'card_border4':(item.status==-1?'card_border5':''))))" (item.status==7?'card_border4':(item.status==-1?'card_border5':''))))"
> >
<!-- :class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
<!-- :class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3': (item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))"-->
(item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))" --> <p slot="title">
<p slot="title">{{item.mesCode}} {{item.mesCode}}
<state <state code="taskList.status" ref="state" class="fr" :value="item.status" type="text"></state>
code="taskList.status" <!-- <span >{{item.status}}</span> -->
ref="state" class="fr" </p>
:value="item.status" <p class="order_tit">{{item.productName}}</p>
type="text" <p>
></state> <Icon type="ios-pricetags" />
<!-- <span >{{item.status}}</span> --> {{item.taskName}}
</p> </p>
<p class="order_tit">{{item.productName}}</p> <p>{{item.beginTime}}~{{item.endTime}}</p>
<p><Icon type="ios-pricetags" />{{item.taskName}}</p> </Card>
<p>{{item.beginTime}}~{{item.endTime}}</p> <p>共 {{listTasks.length}} 个工单</p>
</Card>
<p>共 {{listTasks.length}} 个工单</p>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import Api from "../../api"; import Api from "../../api";
export default { export default {
name:'orderlist', name: "orderlist",
data(){ data() {
return{ return {
gnFlag:0, gnFlag: 0,
listTasks:[], listTasks: [],
dataLength:0, dataLength: 0
} };
},
props: {
order: {
type: String,
default: '',
}
},
created() {
this.loadTree(-9);
},
methods: {
loadTree(value) {
let parmse = {
status: value,
isAsc: true
};
Api.getCardList(parmse).then(res => {
if (res.success) {
this.listTasks = res.result;
this.dataLength = res.result.length;
}
});
}, },
created() { gnFunto(number, type) {
this.loadTree(-9); this.gnFlag = number;
}, },
methods: { goPage(item) {
loadTree(value){ this.$router.push({
let parmse = { path: "/produce/execute",
status: value, query: {
isAsc: true id: item.id,
} orderId: item.orderId,
Api.getCardList(parmse).then(res=>{ executeId: item.executeId,
if(res.success){ headid: item.routingHeaderId,
this.listTasks = res.result dispatchStatus: item.status
this.dataLength = res.result.length }
} });
}) }
}, },
gnFunto(number,type){ watch: {
this.gnFlag = number order(v)
}, {
goPage(item){ //alert(v)
console.log(item) }
this.$Message.success("工单查询数据...") }
}, };
},
watch:{
},
}
</script> </script>
\ No newline at end of file
pages/produce/execute/index.vue
View file @ 99159c18
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<!-- 列表卡片主内容 --> <!-- 列表卡片主内容 -->
<orderlist ref="orderlist" /> <orderlist ref="orderlist" :order="inputId" />
</Drawer> </Drawer>
<!-- 功能区 --> <!-- 功能区 -->
<Drawer <Drawer
...@@ -56,8 +56,9 @@ export default { ...@@ -56,8 +56,9 @@ export default {
detail: null, detail: null,
row:{}, row:{},
odermodel: -9, odermodel: -9,
orderId: null, orderId: this.$route.query.id,
condition: [] condition: [],
inputId: null,
}; };
}, },
created() { created() {
...@@ -66,6 +67,7 @@ export default { ...@@ -66,6 +67,7 @@ export default {
row.orderId = this.$route.query.orderId; row.orderId = this.$route.query.orderId;
row.executeId = this.$route.query.executeId; row.executeId = this.$route.query.executeId;
this.row=row this.row=row
this.inputId=this.$route.query.id
this.detail = () => import("./starOrder/index"); this.detail = () => import("./starOrder/index");
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
...@@ -120,6 +122,14 @@ export default { ...@@ -120,6 +122,14 @@ export default {
} //测试数据 } //测试数据
} }
}, },
watch: {} watch: {
'$route.query.id'(v)
{
this.row.id = v
this.inputId=v
this.detail = () => import("./starOrder/index")
},
}
}; };
</script> </script>
pages/produce/execute/starOrder/index.vue
View file @ 99159c18
<template> <template>
<div class> <div class>
<div class="star" v-if="!starmodal"> <div class="star" v-if="dispatchStatus==12">
<a class="start" @click="starFun"> <a class="start" @click="starFun">
<Icon type="md-play" />开工 <Icon type="md-play" />开工
</a> </a>
</div> </div>
<div class="star" v-else-if="starmodal"> <div class="star" v-else>
<div class="flex fc-b"> <div class="flex fc-b">
<Button class="button" size="large" type="primary"> <Button class="button" size="large" type="primary" @click="pauseFun" v-show="btnTextStatus">
<Icon type="ios-pause" />暂停 <Icon type="ios-pause" />
{{btnText}}
</Button> </Button>
<Button class="button" size="large" type="primary"> <Button class="button" size="large" type="primary" @click="goPage(8,'数据填报')">
<Icon type="logo-angular" />交检 <Icon type="logo-angular" />数据填报
</Button> </Button>
<Button class="button" size="large" type="primary"> <Button class="button" size="large" type="primary" @click="goPage(7,'质量判定')">
<Icon type="ios-checkmark-circle-outline" />完工 <Icon type="ios-checkmark-circle-outline" />质量判定
</Button> </Button>
<Button class="button" size="large" type="primary" @click="transferFn"> <Button class="button" size="large" type="primary" @click="transferFn">
<Icon type="md-swap" />转序交接 <Icon type="md-swap" />转序交接
</Button> </Button>
</div> </div>
<div class="star_step"> <div class="star_step" v-if="false">
<div class="step_item" v-for="i of 6" :key="i"> <div class="step_item" v-for="i of 6" :key="i">
<p class="icon_A" v-if="i>=4"> <p class="icon_A" v-if="i>=4">
<Icon type="md-checkmark-circle" /> <Icon type="md-checkmark-circle" />
...@@ -50,7 +51,10 @@ ...@@ -50,7 +51,10 @@
<ul> <ul>
<li>产品名称：{{entity.productName}}</li> <li>产品名称：{{entity.productName}}</li>
<li>图号：{{entity.drawnNumber}}</li> <li>图号：{{entity.drawnNumber}}</li>
<li>状态：{{entity.status}}</li> <li>
状态：
<state code="plan.order.status" ref="state" :value="entity.status" type="text"></state>
</li>
<li>订单编号：{{entity.mesCode}}</li> <li>订单编号：{{entity.mesCode}}</li>
<li>批次号：{{entity.batchNumber}}</li> <li>批次号：{{entity.batchNumber}}</li>
<li>计划数量：{{entity.quantity}}</li> <li>计划数量：{{entity.quantity}}</li>
...@@ -64,13 +68,14 @@ ...@@ -64,13 +68,14 @@
<li>派工数量：{{entity.dispatchQuantity}}</li> <li>派工数量：{{entity.dispatchQuantity}}</li>
<li>人员信息：{{entity.userNames}}</li> <li>人员信息：{{entity.userNames}}</li>
<li>准备工时：{{entity.setupTime}}</li> <li>准备工时：{{entity.setupTime}}</li>
<li>工单状态： <state code="taskList.status" ref="state1" :value="dispatchStatus" type="text"></state></li>
</ul> </ul>
</div> </div>
<div class="img_box fl" style="background:#DDD"> <div class="img_box fl" style="background:#DDD">
<ViewerImg :images="images" /> <ViewerImg :images="images" />
</div> </div>
</div> </div>
<Modal v-model="ransferModal" :title="transferTitle" width="800" > <Modal v-model="ransferModal" :title="transferTitle" width="800">
<!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> --> <!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> -->
<p>转序交接</p> <p>转序交接</p>
</Modal> </Modal>
...@@ -90,9 +95,29 @@ export default { ...@@ -90,9 +95,29 @@ export default {
ransferModal: false, ransferModal: false,
transferTitle: "确认转序", transferTitle: "确认转序",
images: [], images: [],
iamges1: [
{
thumbnail: iconImg + "noPic_product.png",
source: iconImg + "noPic_product.png"
}
],
entity: {}, entity: {},
id: Number(this.$route.query.id), id: Number(this.$route.query.id),
eid: "" orderId: Number(this.$route.query.orderId),
dispatchStatus: Number(this.$route.query.dispatchStatus),
eid: "",
btnText:
Number(this.$route.query.dispatchStatus) == 14
? "暂停"
: Number(this.$route.query.dispatchStatus) == 5
? "继续"
: "",
btnTextStatus:
Number(this.$route.query.dispatchStatus) == 14
? true
: Number(this.$route.query.dispatchStatus) == 5
? true
: false
}; };
}, },
created() { created() {
...@@ -102,7 +127,7 @@ export default { ...@@ -102,7 +127,7 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
this.load(this.id) this.load(this.id);
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
...@@ -112,12 +137,81 @@ export default { ...@@ -112,12 +137,81 @@ export default {
}, },
methods: { methods: {
starFun() { starFun() {
this.$Message.success("开工..."); //开工
let params = {
id: this.id,
orderid: this.orderId + ""
};
Api.entrystart(params)
.then(res => {
if (res.success) {
this.$Message.success("开工成功！");
this.dispatchStatus = 14;
this.textBtn();
} else {
this.$Message.error("开工失败！");
}
})
.catch(err => {
this.$Message.error("连接错误");
});
}, },
transferFn(){ pauseFun() {
this.ransferModal = true //暂停or继续
let params = {
id: this.id,
orderid: this.orderId + ""
};
if (this.btnText == "暂停") {
Api.entrypause(params)
.then(res => {
if (res.success) {
this.$Message.success("暂停成功！");
this.dispatchStatus = 5;
this.btnText = "继续";
this.textBtn();
} else {
this.$Message.error("暂停失败！");
}
})
.catch(err => {
this.$Message.error("连接错误");
});
} else if (this.btnText == "继续") {
Api.entrentrycontinuestart(params)
.then(res => {
if (res.success) {
this.$Message.success("继续成功！");
this.dispatchStatus = 14;
this.btnText = "暂停";
this.textBtn();
} else {
this.$Message.error("继续失败！");
}
})
.catch(err => {
this.$Message.error("连接错误");
});
}
},
textBtn() {
//控制第一个按钮的text及显示
if (this.dispatchStatus == 14) {
this.btnText = "暂停";
this.btnTextStatus = true;
} else if (this.dispatchStatus == 5) {
this.btnText = "继续";
this.btnTextStatus = true;
} else {
this.btnText = "";
this.btnTextStatus = false;
}
},
transferFn() {
this.ransferModal = true;
}, },
load(v) { load(v) {
//加载基础数据
let params = { let params = {
id: v id: v
}; };
...@@ -128,13 +222,13 @@ export default { ...@@ -128,13 +222,13 @@ export default {
if (r.result.productId && r.result.productId > 0) { if (r.result.productId && r.result.productId > 0) {
ApiTech.get({ id: r.result.productId }).then(res => { ApiTech.get({ id: r.result.productId }).then(res => {
if (res.success && res.result) { if (res.success && res.result) {
if(res.result.productUrlList&& res.result.productUrlList.length>0) if (
{ res.result.productUrlList &&
this.eid = res.result.productUrlList; res.result.productUrlList.length > 0
} ) {
else this.eid = res.result.productUrlList;
{ } else {
this.eid=this.$u.guid(); this.eid = this.$u.guid();
} }
//查询上传到文件服务器上的文件 //查询上传到文件服务器上的文件
let parms = { let parms = {
...@@ -143,18 +237,24 @@ export default { ...@@ -143,18 +237,24 @@ export default {
name: "", name: "",
field: "" field: ""
}; };
this.$http.sysUser.getFile(parms).then(res1 => { this.$http.sysUser
if (res1.data != [] && res1.data.length > 0) { .getFile(parms)
this.images = []; .then(res1 => {
res1.data.forEach(datas => { if (res1.data != [] && res1.data.length > 0) {
let objImag = {}; this.images.splice(0);
objImag.thumbnail=this.downUrl+datas.downloadPath res1.data.forEach(datas => {
objImag.source=this.downUrl+datas.downloadPath let objImag = {};
this.images.push(objImag) objImag.thumbnail = this.downUrl + datas.downloadPath;
}); objImag.source = this.downUrl + datas.downloadPath;
} this.images.push(objImag);
}); });
} else {
this.images = this.iamges1;
}
})
.catch(err => {
this.images = this.iamges1;
});
} }
}); });
} }
...@@ -169,11 +269,36 @@ export default { ...@@ -169,11 +269,36 @@ export default {
}, },
show() { show() {
this.$viewer.show(); this.$viewer.show();
},
goPage(type,title)
{
this.$parent.changeTitle(type,title)
} }
}, },
watch:{ watch: {
images(v){ "$route.query.id"(v1) {
this.images=v this.images = [];
this.id = v1;
this.load(v1);
},
"$route.query.dispatchStatus"(v2) {
this.dispatchStatus = v2;
if (v2 == 14) {
this.btnText = "暂停";
this.btnTextStatus = true;
} else if (v2 == 5) {
this.btnText = "继续";
this.btnTextStatus = true;
} else {
this.btnText = "";
this.btnTextStatus = false;
}
},
"$route.query.orderId"(v3) {
this.orderId = v3;
},
images(v) {
this.images = v;
} }
} }
}; };
......
pages/produce/orderlist.vue
View file @ 99159c18
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button> <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template> </template>
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId)"> <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.status)">
<Row class="title-i"> <Row class="title-i">
<Col :span="10" class="order-code">{{row.productName}}</Col> <Col :span="10" class="order-code">{{row.productName}}</Col>
<Col :span="10" class="order-code">{{row.mesCode}}</Col> <Col :span="10" class="order-code">{{row.mesCode}}</Col>
...@@ -181,7 +181,8 @@ export default { ...@@ -181,7 +181,8 @@ export default {
params.row.id, params.row.id,
params.row.orderId, params.row.orderId,
params.row.executeId, params.row.executeId,
params.row.routingHeaderId params.row.routingHeaderId,
params.row.status
) )
} }
}, },
...@@ -211,11 +212,11 @@ export default { ...@@ -211,11 +212,11 @@ export default {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
}, },
toExecute(id, orderId, executeId,headid) { toExecute(id, orderId, executeId,headid,status) {
//跳转到对应操作页面 获取id:this.$route.query.id //跳转到对应操作页面 获取id:this.$route.query.id
this.$router.push({ this.$router.push({
path: "/produce/execute", path: "/produce/execute",
query: { id: id, orderId: orderId, executeId: executeId,headid:headid } query: { id: id, orderId: orderId, executeId: executeId,headid:headid,dispatchStatus:status }
}); });
}, },
tdStyle(val) { tdStyle(val) {
...@@ -349,8 +350,8 @@ export default { ...@@ -349,8 +350,8 @@ export default {
} }
.box { .box {
color: white; color: white;
width: 70px; width: 80px;
height: 20px; height: 30px;
overflow: hidden; overflow: hidden;
/* Rotate div */ /* Rotate div */
transform: rotate(33deg); transform: rotate(33deg);
......
src/assets/css/base.css
View file @ 99159c18
...@@ -50,6 +50,9 @@ div::-webkit-scrollbar-corner { ...@@ -50,6 +50,9 @@ div::-webkit-scrollbar-corner {
.fc-a { .fc-a {
justify-content: space-around; justify-content: space-around;
} }
.fc-ev {
justify-content: space-evenly;
}
.fd { .fd {
flex-direction: column; flex-direction: column;
} }
...@@ -721,7 +724,7 @@ html [type=button] { ...@@ -721,7 +724,7 @@ html [type=button] {
} }
.waitTask { .waitTask {
/*flex 布局*/ /*flex 布局*/
display: flex!important; display: flex !important;
align-items: center; align-items: center;
width: 200px; width: 200px;
height: 100px; height: 100px;
...@@ -1028,7 +1031,7 @@ html [type=button] { ...@@ -1028,7 +1031,7 @@ html [type=button] {
} }
.menu_side { .menu_side {
background: #fff !important; background: #fff !important;
margin: 5px 0 0 0!important; margin: 5px 0 0 0 !important;
border: 1px solid #dcdee2 !important; border: 1px solid #dcdee2 !important;
} }
.show_menu { .show_menu {
...@@ -1061,3 +1064,6 @@ html [type=button] { ...@@ -1061,3 +1064,6 @@ html [type=button] {
.tohtml img { .tohtml img {
max-width: 95%; max-width: 95%;
} }
.gdShow {
box-shadow: 0px 0px 15px #333;
}
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