Skip to content

M
mes-ui
Commit c0c2dd49 authored by renjintao's avatar renjintao
Browse files
Options

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

parents cc7fb14a 076ee6b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1461 additions and 82 deletions
assets/css/base.less
View file @ c0c2dd49
......@@ -226,7 +226,9 @@ div::-webkit-scrollbar-corner {
.mt50 {
margin-top: 50px;
}
.mt60 {
margin-top: 60px;
}
.mb0 {
margin-bottom: 0px;
}
......
components/page/BtnBox.vue 0 → 100644
View file @ c0c2dd49
<template>
<span class="btnStyle">
<span
class="mr20"
@click="lookBtn($event)"
:class="{
bor: borders,
small: bigBox == 'small',
large: bigBox == 'large',
default: !bigBox,
}"
:style="{ color: colf(type), 'border-block-color': colf(type) }"
>
<Icon :type="iconFont" class="iconStyle" />{{ valueName }}
</span>
</span>
</template>
<script>
export default {
data() {
return {};
},
props: {
type: String,
default: "default",
valueName: String,
default: "",
iconFont: String,
default: "ios-paper",
borders: Boolean,
default: false,
bigBox: String,
default: "",
},
methods: {
colf(v) {
if (v == "error") {
return "#ed4014";
} else if (v == "warning") {
return "#f90";
} else if (v == "success") {
return "#19be6b";
} else if (v == "primary") {
return "#2db7f5";
} else {
return "#515a6e";
}
},
lookBtn(event) {
// console.log("btnBi",event)
this.$emit('click',event);
event.stopPropagation();
},
},
};
</script>
<style lang="less" scoped>
.btnStyle {
// display: inline-block;
font-size: 14px;
.small {
padding: 1px 3px;
}
.large {
padding: 10px 12px;
}
.default {
padding: 1px 7px;
}
.iconStyle {
margin-right: 4px;
}
.bor {
border: 1px solid;
border-radius: 4px;
}
}
</style>
\ No newline at end of file
components/page/Vcard copy.vue 0 → 100644
View file @ c0c2dd49
<template>
<div class="cardPage">
<div
class="cardBox"
:class="{ borderCss: isCard }"
@click="clickCard(columns)"
:columns="columns"
>
<p class="topCard lh40 flex pr" slot="header">
<span class="checkSingle" >
<slot name="checkBox" v-if="checkKey">
<Checkbox
v-model="single"
@on-change="singleChange(single, columns)"
></Checkbox>
</slot>
</span>
<span class="titleName f14 fwBold zh-ellip ml20">
<slot name="title">
{{ columns.topTitle }}
</slot>
</span>
<span class="f14 fwBold zh-ellip topCount">
<slot name="topCount">
{{ columns.topCount }}
</slot>
</span>
<span
class="triangle pa"
v-show="columns.borCol"
:style="{
'border-color':
'transparent ' + columns.borCol + columns.borCol + ' transparent',
}"
></span>
<span class="triangleName pa f12 fwBold" v-show="columns.borCol">{{
columns.markerName
}}</span>
</p>
<div class="countCard">
<div class="mainCount flex" slot="main">
<div class="imgBox" >
<slot name="img" v-if="showImgBox" >
<img :src="columns.srcImg" alt="图片"/>
</slot>
</div>
<div class="rightCount mr20 mt20 ml20" >
<!-- <Filed :span="24" :name="v.name" v-for="(v, i) in columns.filedList" :key="i">
{{ v.content}}
<Icon class="blueFont" type="md-sync" v-if="v.name == '工时：'"
/></Filed> -->
<slot name="fileLine" >
<Filed :span="24" :name="columns.countName4">
{{ columns.content4 }}
<!-- <Icon class="blueFont" type="md-sync" v-if="countIcon" /> -->
</Filed>
</slot>
</div>
</div>
<div class="bottomCard flex" slot="footer">
<span class="earlyWarn f14 fwBold mr20" v-if="columns.leftT1">
<Icon
:type="columns.oneIcon"
class="iconStyle"
v-show="iconShow"
/>{{ columns.leftT1 }}
</span>
<span class="overdue f14 fwBold mr20" v-if="columns.leftT2">
<Icon
:type="columns.twoIcon"
class="iconStyle"
v-show="iconShow"
/>{{ columns.leftT2 }}
</span>
<span class="rightMore">
<span
class="mr20"
@click="lookBtn(columns.id)"
v-if="columns.lookName"
>
<a
><Icon :type="columns.lookIcon" class="iconStyle" />{{
columns.lookName
}}</a
>
</span>
<span class="mr20 elliPsis fwBold" v-show="moreTrue" slot="extra">
<span class="elliPsisSpan">•••</span>
<span class="showMore hide">
<a v-if="columns.editName">
<span class="mr20" @click="editBtn(columns.id)">
<Icon :type="columns.editIcon" class="iconStyle" />
{{ columns.editName }}
</span>
</a>
<a v-if="columns.delName">
<span class="mr20" @click="delBtn(columns.id)">
<Icon :type="columns.delIcon" class="iconStyle" />{{
columns.delName
}}</span
>
</a>
</span>
</span>
</span>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "cardPage",
data() {
return {
// countIcon:this.countIcon , //中间刷新页面
// iconShow: this.iconShow, //是否有icon
// moreTrue: this.moreTrue, //详情
// checkKey: this.checkKey, //是否展示选择框
// showImgBox: this.showImgBox, //图片展示
single: false, //是否选中
isCard: false,
// columns:this.columns
// columns: {
// id: "1",
// borCol: "#2680eb",
// topTitle: "文档标题标题",
// topCount: "DDBH_20200519_1",
// markerName: "暂停中",
// srcImg: require("../../assets/images/logo.png"),
// leftT1: "预警",
// oneIcon: "ios-information-circle-outline",
// leftT2: "超期",
// twoIcon: "ios-alarm-outline",
// lookName: "详情",
// lookIcon: "ios-paper",
// editName: "编辑",
// editIcon: "ios-create-outline",
// delName: "删除",
// delIcon: "ios-trash-outline",
// countName1: "创建人：",
// content1: "张三",
// countName2: "创建时间：",
// content2: "今天",
// countName3: "创建人：",
// content3: "张三",
// countName4: "计划时间：",
// content4: "2020-10-10---2020-11-10",
// countName5: "",
// content5:
// "文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明。",
// countName6: "成员：",
// content6: "张三",
// countName7: "工时：",
// content7: "3天4小时",
// filedList: [
// { name: "创建人：", content: "张三" },
// { name: "创建时间：", content: "今天" },
// { name: "计划时间：", content: "2020-10-10---2020-11-10" },
// {
// name: "",
// content:
// "文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明文档详细说明。",
// },
// { name: "成员：", content: "张三" },
// { name: "工时：", content: "3天4小时" },
// ],
// },
};
},
props: {
// columns: {
// type: Object,
// default: {},
// },
// moreTrue: {
// type: Boolean,
// default: false,
// },
multiple: {
type: Boolean,
default: false,
},
img: {
type: Boolean,
default: false,
},
life:{
type: Object,
}
// moreTrue: {
// type: Boolean,
// default: false,
// },
// iconShow: {
// type: Boolean,
// default: false,
// },
// countIcon: {
// type: Boolean,
// default: false,
// },
},
created() {
// this.columns=this.row
console.log("传过来的值：", this.columns);
},
methods: {
lookBtn(id) {
console.log("详情", id);
event.stopPropagation();
},
editBtn(id) {
console.log("编辑", id);
event.stopPropagation();
},
delBtn(id) {
console.log("删除", id);
event.stopPropagation();
},
clickCard(columns) {
//点击整个card
console.log(columns);
this.isCard = !this.isCard;
this.single = !this.single;
},
singleChange(v, columns) {
console.log(v, columns);
event.stopPropagation();
},
},
};
</script>
<style lang="less" scoped>
.cardBox {
box-sizing: border-box;
width: 498px;
background: #ffffff;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
border-radius: 8px;
.topCard {
height: 40px;
background: rgba(38, 128, 235, 0.2);
border-radius: 8px 8px 0px 0px;
border-bottom: 1px dashed #2680eb;
.checkSingle {
margin-left: 16px;
// margin-right: 24px;
}
.titleName {
width: 190px;
}
.topCount {
max-width: 205px;
}
/* css3绘制三角形 */
.triangle {
width: 0px;
height: 0px;
border-width: 20px;
border-style: solid; /*定义的是实现边框*/
border-radius: 4px;
transform: rotate(-90deg);
right: 0;
top: 0;
}
.triangleName {
right: -5px;
top: -1px;
transform: rotate(45deg);
color: #ffffff;
}
}
.countCard {
height: auto;
.imgBox {
height: 178px;
// width: 178px;
max-width: 178px;
margin: 20px 0px 23px 14px;
border: 1px dashed #232323;
}
.rightCount {
// width: calc(100% - 192px);
min-width: calc(100% - 212px);
.filed-col {
display: inline-flex;
margin-bottom: 6px;
}
.filed-col > .value {
text-indent: 2em !important;
}
.blueFont {
margin-left: 5px;
color: #2680eb;
}
}
.bottomCard {
padding-bottom: 20px;
padding-left: 14px;
.earlyWarn {
color: #ffa000;
}
.overdue {
color: #fe7777;
}
.rightMore {
margin-left: auto;
.elliPsis {
color: #2680eb;
}
.elliPsis:hover {
.showMore {
display: inline-block;
}
.elliPsisSpan {
display: none;
}
}
}
.iconStyle {
margin-right: 4px;
}
}
}
img {
height: 100%;
width: 100%;
}
}
.cardBox:hover {
box-shadow: 0px 0px 10px rgba(38, 128, 235, 0.4);
.topCard {
background: rgba(38, 128, 235, 0.4);
}
}
.borderCss {
border: 2px solid #2680eb;
}
</style>
\ No newline at end of file
components/page/Vcard.vue 0 → 100644
View file @ c0c2dd49
<template>
<div class="cardPage">
<!-- :columns="rowCard" -->
<div
class="cardBox mb10"
:class="{ borderCss: isCard }"
@click="clickCard(row)"
@mouseenter="enterCard"
@mouseleave="leaveCard"
>
<p
class="topCard lh40 flex pr"
:style="{ background: topStyle }"
slot="header"
>
<span class="checkSingle" v-if="multiple">
<slot name="multiple">
<Checkbox
v-model="single"
@on-change="singleChange(single, row)"
></Checkbox>
</slot>
</span>
<span class="titleName f14 fwBold zh-ellip ml20">
<slot name="title" v-if="title">
{{ title }}
</slot>
</span>
<span class="f14 fwBold zh-ellip topCount">
<slot name="topCount" v-if="subtitle">
{{ subtitle }}
</slot>
</span>
<slot name="colorBol">
<span
class="triangle pa"
:style="{
'border-right-color': life,
'border-bottom-color': life,
}"
></span>
<span class="triangleName pa f12 fwBold" v-if="lifeCode">
<state
code="taskList.status"
ref="state"
:value="lifeCode"
type="text"
:color="false"
></state>
</span>
</slot>
</p>
<div class="countCard">
<div class="mainCount flex" slot="main">
<div class="imgBox" v-if="img">
<slot name="img">
<img :src="downUrl + srcImg" v-if="srcImg" alt="图片" />
<div v-else-if="!srcImg">无图片</div>
<img :src="srcImg1" v-else alt="图片" />
</slot>
</div>
<div class="rightCount mr20 mt20 ml20">
<slot name="fileLine">
<Filed :name="countTitle">
{{ count }}
<Icon class="blueFont" type="md-sync" />
</Filed>
</slot>
</div>
</div>
<div class="bottomCard flex" slot="footer">
<div>
<span class="earlyWarn f14 fwBold mr20">
<slot name="leftBottom" v-if="leftOneName">
<Icon :type="leftOneIcon" class="iconStyle" />
{{ leftOneName }}
<!-- v-show="leftBtmicon" -->
</slot>
</span>
<span class="overdue f14 fwBold mr20">
<slot name="leftBottom2" v-if="leftTwoName">
<Icon :type="leftTwoIcon" class="iconStyle" />
{{ leftTwoName }}
</slot>
</span>
</div>
<span class="rightMore">
<slot name="rightBottom"> </slot>
</span>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "cardPage",
data() {
return {
rightList: [],
// rightBottom: true,
life: "",
topStyle: "rgba(38, 128, 235, 0.2)",
countTitle: "",
count: "",
downUrl: fileUrlDown,
single: false, //是否选中
isCard: false,
// rowCard: {},
srcImg1: require("../../assets/imgicon/chan_Pin.png"),
};
},
props: {
// columns: {
// type: Object,
// default: [],
// },
multiple: {
type: Boolean,
default: false,
},
img: {
type: Boolean,
default: false,
},
srcImg: {
type: String,
default: "",
},
moreTrue: {
type: Boolean,
default: false,
},
title: {
type: String,
default: "",
},
subtitle: {
type: String,
default: "",
},
// life: {
// type: String,
// default: "#666",
// },
lifeCode: {
type: [String, Number],
default: "",
},
leftOneName: {
type: String,
default: "",
},
leftOneIcon: {
type: String,
default: "",
},
leftTwoName: {
type: String,
default: "",
},
leftTwoIcon: {
type: String,
default: "",
},
row: {
type: Object,
default: [],
},
},
created() {
if (this.lifeCode) {
this.tdStyle(this.lifeCode);
}
// this.data = this.$store.getters.dictionaryByKey(this.code) || []; //rightM组件中用到
},
methods: {
enterCard() {
if (this.multiple) {
this.topStyle = "rgba(38, 128, 235, 0.4)";
}
},
leaveCard() {
this.topStyle = "rgba(38, 128, 235, 0.2)";
},
tdStyle(val) {
//动态根据状态值加载状态值对应的颜色
let temDic = this.$store.getters.dictionaryByKey("taskList.status");
this.life = "";
temDic.forEach((s) => {
if (Number(s.code) == val) {
this.life = s.color;
}
});
},
clickCard(value) {
console.log(value);
//点击整个card
this.isCard = !this.isCard;
this.single = !this.single;
},
singleChange(v, rows) {
console.log(v, rows);
//checkbox
event.stopPropagation();
},
},
};
</script>
<style lang="less" >
.cardBox {
min-height: 310px;
box-sizing: border-box;
background: #ffffff;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
border-radius: 8px;
// margin-bottom: 15px;
.topCard {
height: 40px;
// background: rgba(38, 128, 235, 0.2);
border-radius: 8px 8px 0px 0px;
border-bottom: 1px dashed #2680eb;
.checkSingle {
margin-left: 16px;
}
.titleName {
// width: 190px;
min-width: 190px;
}
.topCount {
// max-width: 205px;
min-width: 205px;
}
/* css3绘制三角形 */
.triangle {
width: 0px;
height: 0px;
border-width: 20px;
border-style: solid; /*定义的是实现边框*/
border-color: transparent;
border-radius: 4px;
transform: rotate(-90deg);
right: 0;
top: 0;
}
.triangleName {
right: -3px;
top: -3px;
transform: rotate(45deg);
color: #ffffff;
.ib > span {
font-size: 12px;
}
}
}
.countCard {
height: auto;
.imgBox {
height: 178px;
max-width: 178px;
margin: 20px 0px 23px 14px;
border: 1px dashed #232323;
div {
line-height: 178px;
text-align: center;
width: 178px;
}
}
.rightCount {
min-width: calc(100% - 212px);
.filed-col {
display: flex;
margin-bottom: 6px;
}
.filed-col > .value {
text-indent: 2em !important;
}
.blueFont {
margin-left: 5px;
color: #2680eb;
}
}
.bottomCard {
justify-content: space-between;
padding-bottom: 20px;
padding-left: 14px;
.leftBtm {
display: inline-block;
}
.earlyWarn {
color: #ffa000;
}
.overdue {
color: #fe7777;
}
.rightMore {
margin-left: auto;
}
}
}
img {
height: 100%;
width: 100%;
}
}
.cardBox:hover {
box-shadow: 0px 0px 10px rgba(38, 128, 235, 0.4);
// .topCard {
// background: rgba(38, 128, 235, 0.4);
// }
}
.borderCss {
border: 2px solid #2680eb;
}
</style>
\ No newline at end of file
components/page/filed.vue
View file @ c0c2dd49
<template>
<Col :span="span" class="filed-col">
<div class="label">
<div class="label" v-if="name">
<label v-text="name"></label>
</div>
<div class="value">
<div class="value" >
<slot></slot>
</div>
</Col>
......
components/page/opration.vue
View file @ c0c2dd49
......@@ -68,7 +68,6 @@ export default {
delete: "删除",
remove: "删除"
};
if (oprates[this.oprate]) {
this.text = oprates[this.oprate];
this.css = this.oprate;
......@@ -89,7 +88,7 @@ export default {
methods: {
handler() {
if (this.disable == 0) {
if (this.oprate == "delete" || this.oprate == "remove") {
if (this.oprate == "delete" || this.oprate == "remove"||this.msg.length>0) {
this.$Modal.confirm({
title: this.title,
content: "<p>" + this.msg + "</p>",
......
components/page/rightM.vue 0 → 100644
View file @ c0c2dd49
<template>
<div
class="rightM flex"
:class="{ mr10: num == 1 }"
v-if="rightM && rightList"
@mouseleave="outPut"
>
<slot >
<op v-if="rightList && rightList.slice(0, num).length > 0"
v-for="(v, i) in rightList.slice(0, num)"
:key="i"
:title="v.name"
:type="v.type"
:msg="v.msg"
:disable="v.disable"
@click="v.click(row,$event)"
>
<Icon :type="v.icon==null || v.icon==undefined ? 'ios-paper':v.icon" v-if="v.type=='icon'|| v.type=='' || v.type==undefined || v.type==null "/>
<span v-if="v.name">
{{ v.name }}
</span>
</op>
<span
class="elliPsis fwBold"
slot="elliPsis"
v-if="rightList && rightList.length > num > 0"
>
<span :class="{ hide: inlines, mr10: !inlines }" @mouseenter="inFo"
>•••</span >
<span class="mr10" :class="{ inline: inlines, hide: !inlines }">
<op
v-for="(value, index) in rightList.slice(num)"
:key="index"
:title="value.name"
:type="value.type"
:msg="value.msg"
:disable="value.disable"
@click="value.click(row,$event)"
v-if="rightList && rightList.slice(num).length >= num"
>
<Icon :type="value.icon==''?'ios-paper':value.icon" v-if="value.type=='icon'|| value.type=='' || value.type==undefined || value.type==null"/>
<span v-if="value.name">
{{ value.name }}
</span>
</op>
</span>
</span>
</slot>
</div>
</template>
<script>
export default {
data() {
return {
inlines: false,
btnBoxList: [],
};
},
props: {
row: {
type:[Object,Array],
default: []
},
rightList: {
type:[Object,Array],
default: [],
},
num: {
type: Number,
default: 0,
},
rightM: {
type: Boolean,
default: true,
},
},
mounted() {
// console.log("$slots",this.$slots,this.$slots.default)
},
methods: {
inFo() {
this.inlines = true;
},
outPut() {
this.inlines = false;
},
},
};
</script>
<style lang="less" scoped>
.rightM {
cursor: pointer;
height: auto;
.elliPsis {
color: #2680eb;
}
}
</style>
\ No newline at end of file
pages/aps/stream/index.vue
View file @ c0c2dd49
......@@ -73,68 +73,54 @@
</Row>
<Row class="right-body">
<Col class="list" span="24">
<Card v-for="(li, i) in result" :key="i">
<p slot="title">
<Badge :count="i + 1"></Badge>
{{ li.routingCode }} / {{ li.routingName }}
</p>
<Timeline>
<TimelineItem v-for="(item, index) in li.list" :key="index">
<Badge
:count="item.seq"
slot="dot"
:type="item.aps == 1 ? 'error' : 'success'"
></Badge>
<div class="set-name">
<span
@click="sets(i, item, index)"
class="mr20"
:class="active == index ? 'gongTitle' : ''"
>工序名称：{{ item.name }}</span
>
<op
title="拆分工序"
@click="split(li, i, item, index)"
type="icon"
icon="ios-cut"
v-if="item.quantity > 1 && !item.chai"
>
</op>
<op
title="移除"
@click="remove(item, index)"
type="icon"
icon="ios-trash"
oprate="delete"
v-if="item.chai"
>
</op>
</div>
<div class="content">数量：{{ item.quantity }}</div>
<div v-show="item.userIds" class="content">
人员：
<span v-for="(u, j) in item.userIds" :key="j">
<User :value="u"></User>&nbsp;&nbsp;&nbsp;
</span>
</div>
<div v-show="item.shopName" class="content">
班组：
{{ item.shopName }}
</div>
<div v-show="item.beginTime" class="content">
时间：
{{ item.beginTime }} —— {{ item.endTime }}
</div>
<div v-show="item.remark" class="content">
备注：
{{ item.remark }}
</div>
<!-- <div>工序号：{{item.task_seq}}</div> -->
</TimelineItem>
</Timeline>
</Card>
<Timeline>
<TimelineItem v-for="(item, index) in result" :key="index">
<Badge :count="item.seq" slot="dot" :type="type(index)"></Badge>
<div class="set-name">
<span
@click="sets(item, index)"
class="mr20"
:class="active == index ? 'gongTitle' : ''"
>工序名称：{{ item.name }}</span
>
<op
title="拆分工序"
@click="split(item, index)"
type="icon"
icon="ios-cut"
v-if="item.quantity > 1 && !item.chai"
></op>
<op
title="移除"
@click="remove(item, index)"
type="icon"
icon="ios-trash"
oprate="delete"
v-if="item.chai"
></op>
</div>
<div class="content">数量：{{ item.quantity }}</div>
<div v-show="item.userIds" class="content">
人员：
<span v-for="(u, j) in item.userIds" :key="j">
<User :value="u"></User>&nbsp;&nbsp;&nbsp;
</span>
</div>
<div v-show="item.shopName" class="content">
班组：
{{ item.shopName }}
</div>
<div v-show="item.beginTime" class="content">
时间：
{{ item.beginTime }} —— {{ item.endTime }}
</div>
<div v-show="item.remark" class="content">
备注：
{{ item.remark }}
</div>
<!-- <div>工序号：{{item.task_seq}}</div> -->
</TimelineItem>
</Timeline>
<div>
<Drawer
title="排产设置盘"
......
pages/cardList/index.vue 0 → 100644
View file @ c0c2dd49
This diff is collapsed.
pages/produce/orderlist.vue
View file @ c0c2dd49
......@@ -9,7 +9,7 @@
:lazy="true"
:conditions="easySearch"
:action="action"
:gutter="40"
:gutter="10"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
......@@ -42,7 +42,8 @@
@click="changeShwo"
></Button>
</template>
<template slot="card" slot-scope="{ row }">
<template slot="card" slot-scope="{ row }" >
<div
class="body"
@click="
......@@ -94,14 +95,7 @@
height="100%"
/>
</div>
<!-- <img
:src="getUrl(row.productUrl)"
width="120"
height="120"
:title="row.productUrl"
style="border:#cacbd0 dashed 1px"
onerror="this.src='/imgicon/noPic_product.png';"
/>-->
</Col>
<Col span="16" class="row">
<p>
......@@ -174,6 +168,39 @@
</Row>
</div>
</div>
<!-- <Vcard
v-if='row'
:row='row'
:img="img"
:srcImg='row.productUrl'
:title="row.productName"
:subtitle="row.mesCode"
:lifeCode="row.status"
:leftOneName='row.drawnNumber'
>
<template slot="fileLine">
<Filed :span="24" :name="l('beginTime')">
{{ row.beginTime }}
</Filed>
<Filed :span="24" :name="l('endTime')">
{{ row.endTime }}
</Filed>
<Filed :span="12" :name="l('quantity')">
{{ row.quantity }}
</Filed>
<Filed :span="12" name="工序号：">
{{ row.taskSeq }}
</Filed>
<Filed :span="24" name="工序名称：">
{{ row.taskName }}
</Filed>
</template> -->
<!-- <template slot="leftBottom"> 图号:{{ row.drawnNumber }} </template> -->
<!-- <template slot="rightBottom">
<RightM :num="num" :rightM="rightBottom" :rightList="buttons" :row="row">
</RightM>
</template> -->
<!-- </Vcard> -->
</template>
</DataGrid>
</div>
......@@ -189,7 +216,70 @@ export default {
},
data() {
return {
num: 2,
span: "9",
rightBottom: true,
multiple: false,
img: true,
action: Api.index,
buttons: [
{
name: "查看",
msg: "",
// type: "",
disable: false,
icon: "ios-paper",
click: (v,event) => {
console.log("add", v,event);
event.stopPropagation();
},
},
{
name: "编辑",
type: "icon",
msg: "",
disable: false,
icon: "ios-create-outline",
click: (v,event) => {
console.log("edit", v,event);
event.stopPropagation();
},
},
{
type: "icon",
name: "删除",
msg: "34534534",
disable: false,
icon: "ios-trash-outline",
click: (v,event) => {
console.log("del",v,event);
event.stopPropagation();
},
},
{
name: "导入",
type: "icon",
msg: "",
disable: false,
icon: "ios-create-outline",
click: (v,event) => {
console.log("1", v,event);
event.stopPropagation();
},
},
{
name: "导出",
type: "icon",
msg: "",
disable: false,
icon: "ios-create-outline",
click: (v,event) => {
console.log("2",v,event);
event.stopPropagation();
},
},
],
easySearch: {
keys: {
op: "mesCode,productName,drawnNumber",
......@@ -360,6 +450,8 @@ export default {
});
},
tdStyle(val) {
console.log(val);
// debugger
//动态根据状态值加载状态值对应的颜色
let temDic = this.$store.getters.dictionaryByKey("taskList.status");
let temColor = "#666";
......
pages/rightMore/index.vue 0 → 100644
View file @ c0c2dd49
<template>
<div class="rightM" v-if="rightM">
<div v-if="num == 1">
<slot >
<!-- <BtnBox
:borders="true"
:valueName="`查看`"
:type="`success`"
:iconFont="`ios-create-outline`"
></BtnBox> -->
</slot>
</div>
<div v-if="num > 1" slot="all">
<slot >
<!-- <BtnBox
:borders="true"
:valueName="`查看`"
:type="`success`"
:iconFont="`ios-create-outline`"
></BtnBox> -->
</slot>
<span class="mr20 elliPsis fwBold" slot="elliPsis">
<span class="elliPsisSpan">•••</span>
<span class="showMore hide mr20">
<slot >
<!--<BtnBox
:bigBox="`small`"
:borders="true"
:valueName="`编辑`"
:type="`primary`"
:iconFont="`ios-create-outline`"
></BtnBox>
<BtnBox
:valueName="`删除`"
:type="`error`"
:iconFont="`ios-trash-outline`"
></BtnBox> -->
</slot>
</span>
</span>
</div>
</div>
</template>
<script>
export default {
// name: '',
data() {
return {
num:1,
rightM: true,
};
},
props: {
// num: Number,
// default: 1,
// valueName: String,
// default: "查看",
// iconFont:String,
// default: "ios-paper",
},
mounted() {},
methods: {
lookBtn(id) {
console.log("详情", id);
event.stopPropagation();
},
editBtn(id) {
console.log("编辑", id);
event.stopPropagation();
},
delBtn(id) {
console.log("删除", id);
event.stopPropagation();
},
},
};
</script>
<style lang="less" scoped>
.rightM {
height: auto;
.elliPsis {
color: #2680eb;
}
.elliPsis:hover {
.showMore {
display: inline-block;
}
.elliPsisSpan {
display: none;
}
}
}
</style>
\ No newline at end of file
plugins/iview.js
View file @ c0c2dd49
......@@ -82,10 +82,10 @@ import DateRange from '@/components/page/dateRange.vue'
import FilesViewer from '@/components/page/filesViewer.vue'
import Bmenu from '@/components/page/bmenu'
import Submenus from '@/components/page/bmenu/components/Submenu'
import Contextmenu from "vue-contextmenujs"
import Vcard from '@/components/page/Vcard.vue'
import BtnBox from '@/components/page/BtnBox.vue'
import RightM from '@/components/page/rightM.vue'
// import FormMaking from 'form-making'
// import 'form-making/dist/FormMaking.css'
// import Element from 'element-ui';
......@@ -151,7 +151,7 @@ Vue.component("DepartmentSelect", DepartmentSelect)
Vue.component("ProductNumberSelect", ProductNumberSelect)
Vue.component("ProductSelect", ProductSelect)
Vue.component("ProductSelect1", ProductSelect1)
Vue.component("ProjectTaskTree",ProjectTaskTree)
Vue.component("ProjectTaskTree", ProjectTaskTree)
Vue.component("DTSpan", DTSpan)
Vue.component("DTSearch", DTSearch)
Vue.component("InputTime", InputTime)
......@@ -167,11 +167,17 @@ Vue.component("WordTree", WordTree)
Vue.component("Actions", Actions)
Vue.component("DateRange", DateRange)
Vue.component("Life", Life)
Vue.component("FilesViewer",FilesViewer)
Vue.component("FilesViewer", FilesViewer)
Vue.use(Contextmenu);
//注入mock
// require("../mock")
// Vue.component("Vcard", Vcard)
// Vue.component("BtnBox", BtnBox)
// Vue.component("RightM", RightM)
//注入mock
// require("../mock")
Vue.prototype.$api = request;
Vue.prototype.$http = Api;
Vue.prototype.$u = Henq;
......
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