Skip to content

M
mes-ui
Commit 40e99520 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

字体颜色

parent 0ae95bab
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 386 deletions
assets/css/custom.less
View file @ 40e99520
...@@ -19,5 +19,11 @@ ...@@ -19,5 +19,11 @@
//收藏夹自体图标颜色 //收藏夹自体图标颜色
@icon-color: #2680eb; @icon-color: #2680eb;
//首页标题颜色
@title-color: #0099ff;
//表格、表单 以及其他字体颜色
@table-color:#515A6E;
//弹框颜色 //弹框颜色
@modal-header-bg-color: #515A6E; @modal-header-bg-color: #515A6E;
assets/css/iview-reset.less
View file @ 40e99520
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
vertical-align: middle; vertical-align: middle;
float: left; float: left;
font-size: 14px; font-size: 14px;
color: #515a6e; color: @table-color;
line-height: 1; line-height: 1;
padding: 10px 12px 10px 0; padding: 10px 12px 10px 0;
box-sizing: border-box; box-sizing: border-box;
...@@ -256,7 +256,10 @@ ...@@ -256,7 +256,10 @@
} }
} }
//表格字体颜色
.ivu-table {
color:@table-color !important;
}
//校验不通过下面提示红色小字 //校验不通过下面提示红色小字
.ivu-form-item-error-tip { .ivu-form-item-error-tip {
position: absolute; position: absolute;
......
components/page/materiel.vue
View file @ 40e99520
...@@ -403,6 +403,7 @@ export default { ...@@ -403,6 +403,7 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../assets/css/custom.less";
.userSelect { .userSelect {
.users { .users {
width: 100%; width: 100%;
...@@ -460,7 +461,7 @@ export default { ...@@ -460,7 +461,7 @@ export default {
display: inline-block; display: inline-block;
background: rgba(38, 128, 235, 0.1); background: rgba(38, 128, 235, 0.1);
border: 2px solid transparent; border: 2px solid transparent;
color: #515a6e; color: @table-color;
margin: 10px; margin: 10px;
a { a {
display: inline-flex; display: inline-flex;
......
components/page/userSelect.vue
View file @ 40e99520
...@@ -324,6 +324,7 @@ export default { ...@@ -324,6 +324,7 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../assets/css/custom.less";
.userSelect { .userSelect {
.users { .users {
width: 100%; width: 100%;
...@@ -381,7 +382,7 @@ export default { ...@@ -381,7 +382,7 @@ export default {
display: inline-block; display: inline-block;
background: rgba(38, 128, 235, 0.1); background: rgba(38, 128, 235, 0.1);
border: 2px solid transparent; border: 2px solid transparent;
color: #515a6e; color: @table-color;
margin: 10px; margin: 10px;
a { a {
display: inline-flex; display: inline-flex;
......
pages/aps/complete/index.vue
View file @ 40e99520
...@@ -320,6 +320,7 @@ export default { ...@@ -320,6 +320,7 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less";
.addclass { .addclass {
border-color: rgba(38, 128, 235, 0.2) !important; border-color: rgba(38, 128, 235, 0.2) !important;
.title-i { .title-i {
...@@ -358,7 +359,7 @@ export default { ...@@ -358,7 +359,7 @@ export default {
padding: 0 8px; padding: 0 8px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
color: #515a6e; color: @table-color;
background: #e4e6ed; background: #e4e6ed;
.order-ringht { .order-ringht {
text-align: right; text-align: right;
...@@ -378,7 +379,7 @@ export default { ...@@ -378,7 +379,7 @@ export default {
padding: 0 8px; padding: 0 8px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
color: #515a6e; color:@table-color;
} }
} }
} }
......
pages/aps/stream/index.vue
View file @ 40e99520
...@@ -402,14 +402,14 @@ export default { ...@@ -402,14 +402,14 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less">
@import "../../../assets/css/custom.less";
.addclass { .addclass {
border-color: rgba(38, 128, 235, 0.5) !important; border-color: rgba(38, 128, 235, 0.5) !important;
.title-i { .title-i {
background: rgba(38, 128, 235, 0.5) !important; background: rgba(38, 128, 235, 0.5) !important;
} }
} }
.scheduling { .scheduling {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
...@@ -451,7 +451,7 @@ export default { ...@@ -451,7 +451,7 @@ export default {
padding: 0 8px; padding: 0 8px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
color: #515a6e; color: @table-color;
background: #e4e6ed; background: #e4e6ed;
.order-ringht { .order-ringht {
text-align: right; text-align: right;
...@@ -471,7 +471,7 @@ export default { ...@@ -471,7 +471,7 @@ export default {
padding: 0 8px; padding: 0 8px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
color: #515a6e; color: @table-color;
} }
} }
} }
...@@ -533,13 +533,11 @@ export default { ...@@ -533,13 +533,11 @@ export default {
} }
} }
} }
</style>
<style lang="less">
.right-body { .right-body {
.list { .list {
.s0 { .s0 {
color: #515a6e !important; color:@table-color !important;
} }
} }
} }
</style> </style>
\ No newline at end of file
pages/crm/project/index.vue
View file @ 40e99520
...@@ -245,6 +245,7 @@ export default { ...@@ -245,6 +245,7 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../../assets/css/custom.less";
.addclass { .addclass {
border-color: #249e91 !important; border-color: #249e91 !important;
.title-i { .title-i {
...@@ -304,7 +305,7 @@ export default { ...@@ -304,7 +305,7 @@ export default {
.fa { .fa {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
color: #515a6e; color:@table-color;
} }
} }
} }
...@@ -343,7 +344,7 @@ export default { ...@@ -343,7 +344,7 @@ export default {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
.fa { .fa {
color: #515a6e; color: @table-color;
} }
} }
} }
......
pages/crm/sales/projectList.vue
View file @ 40e99520
...@@ -128,10 +128,10 @@ export default { ...@@ -128,10 +128,10 @@ export default {
Add, Add,
Edit, Edit,
Detail, Detail,
Search Search,
}, },
props: { props: {
stage: Number stage: Number,
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -152,62 +152,62 @@ export default { ...@@ -152,62 +152,62 @@ export default {
addId: { addId: {
projectId: 0, projectId: 0,
customerId: 0, customerId: 0,
principal: 0 principal: 0,
}, },
getSearch: { getSearch: {
conditions: [ conditions: [
{ {
fieldName: "stage", fieldName: "stage",
fieldValue: "1", fieldValue: "1",
conditionalType: "Equal" conditionalType: "Equal",
}, },
{ {
fieldName: "", fieldName: "",
fieldValue: "", fieldValue: "",
conditionalType: "Equal" conditionalType: "Equal",
} },
], ],
pageSize: 1000 pageSize: 1000,
}, },
listOperation: [], listOperation: [],
easySearch: { easySearch: {
keys: { op: "deliverable", value: null }, keys: { op: "deliverable", value: null },
stage: { op: "Equal", value: null }, stage: { op: "Equal", value: null },
projectId: { op: "Equal", value: null } projectId: { op: "Equal", value: null },
}, },
addModal: false, addModal: false,
editModal: false, editModal: false,
detailModal: false, detailModal: false,
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }] columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }],
}; };
}, },
filters: { filters: {
filterFun: function(value) { filterFun: function (value) {
if (value && value.length > 8) { if (value && value.length > 8) {
value = value.substring(0, 8) + "..."; value = value.substring(0, 8) + "...";
} }
return value; return value;
}, },
filterFun2: function(value) { filterFun2: function (value) {
if (value && value.length > 15) { if (value && value.length > 15) {
value = value.substring(0, 15) + "..."; value = value.substring(0, 15) + "...";
} }
return value; return value;
} },
}, },
created() { created() {
this.getList(1); this.getList(1);
}, },
computed: { computed: {
productList() { productList() {
return this.list.filter(u => { return this.list.filter((u) => {
return u.name.indexOf(this.keys) > -1; return u.name.indexOf(this.keys) > -1;
}); });
} },
}, },
methods: { methods: {
clickSearch() { clickSearch() {
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
}, },
getList(v) { getList(v) {
this.getSearch.conditions[0].fieldValue = v + ""; this.getSearch.conditions[0].fieldValue = v + "";
Api.pagedList(this.getSearch).then(r => { Api.pagedList(this.getSearch).then((r) => {
if (r.success) { if (r.success) {
this.list = r.result; this.list = r.result;
this.search(); this.search();
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
this.curId = id; this.curId = id;
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then(r => { Api.delete({ id: this.curId }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.deletelModal = false; this.deletelModal = false;
...@@ -286,7 +286,7 @@ export default { ...@@ -286,7 +286,7 @@ export default {
l(key) { l(key) {
let vkey = "Follow" + "." + key; let vkey = "Follow" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
} },
}, },
watch: { watch: {
stage(v) { stage(v) {
...@@ -297,11 +297,12 @@ export default { ...@@ -297,11 +297,12 @@ export default {
if (v) { if (v) {
this.search(); this.search();
} }
} },
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less";
.addclass { .addclass {
border-color: #515a6e !important; border-color: #515a6e !important;
.title-i { .title-i {
...@@ -388,7 +389,7 @@ export default { ...@@ -388,7 +389,7 @@ export default {
color: #fff; color: #fff;
} }
a:hover { a:hover {
color: #515a6e; color: @table-color;
} }
} }
} }
...@@ -396,7 +397,7 @@ export default { ...@@ -396,7 +397,7 @@ export default {
background: rgba(167, 184, 204, 0.2); background: rgba(167, 184, 204, 0.2);
padding: 5px 8px; padding: 5px 8px;
.fa { .fa {
color: #515a6e; color: @table-color;
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
......
pages/dispatched/index.vue
View file @ 40e99520
...@@ -518,11 +518,12 @@ export default { ...@@ -518,11 +518,12 @@ export default {
} }
</script> </script>
<style lang='less'> <style lang='less'>
@import "../../assets/css/custom.less";
.ivu-table-wrapper { .ivu-table-wrapper {
overflow: inherit; overflow: inherit;
} }
.userstyle { .userstyle {
color: #515a6e; color: @table-color;
display: block; display: block;
width: 100%; width: 100%;
padding: 4px; padding: 4px;
......
pages/home/component/approval.vue
View file @ 40e99520
...@@ -105,17 +105,18 @@ export default { ...@@ -105,17 +105,18 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less";
.approval { .approval {
background: rgba(255, 255, 255, 1); background: @card-bg;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px; border-radius: 8px;
} }
.row_head { .row_head {
height: 30px; height: 30px;
color: #0099ff; color: @title-color;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
a { a {
color: #0099ff; color: @title-color;
} }
} }
.row_card_body { .row_card_body {
......
pages/home/component/materielChart.vue
View file @ 40e99520
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
.row_head { .row_head {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
color: #0099ff; color: @title-color;
margin-left: 10px; margin-left: 10px;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
} }
......
pages/home/component/staChart.vue
View file @ 40e99520
...@@ -337,7 +337,7 @@ export default { ...@@ -337,7 +337,7 @@ export default {
.row_head { .row_head {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
color: #0099ff; color: @title-color;
margin: 0 10px; margin: 0 10px;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
.geng-duo { .geng-duo {
......
pages/home/component/suspendChart.vue
View file @ 40e99520
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
margin-left: 10px; margin-left: 10px;
color: #0099ff; color:@title-color;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
} }
} }
......
pages/home/component/unqualifiedEcharts.vue
View file @ 40e99520
...@@ -191,7 +191,7 @@ export default { ...@@ -191,7 +191,7 @@ export default {
.row_head { .row_head {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
color: #0099ff; color:@title-color;
// margin: 0 10px; // margin: 0 10px;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
.geng-duo { .geng-duo {
......
pages/home/component/unreadMessage.vue
View file @ 40e99520
...@@ -94,18 +94,19 @@ export default { ...@@ -94,18 +94,19 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less";
.todolist-u { .todolist-u {
background: rgba(255, 255, 255, 1); background: @card-bg;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px; border-radius: 8px;
} }
.row_head { .row_head {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
color: #0099ff; color: @title-color;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
a { a {
color: #0099ff; color: @title-color;
} }
} }
.msg { .msg {
......
pages/home/component/workChart.vue
View file @ 40e99520
...@@ -310,7 +310,7 @@ export default { ...@@ -310,7 +310,7 @@ export default {
.row_head { .row_head {
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
color: #0099ff; color: @title-color;
margin-left: 10px; margin-left: 10px;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
.geng-duo { .geng-duo {
......
pages/implement/table.less
View file @ 40e99520
@import "../../assets/css/custom.less";
.transmit_box { .transmit_box {
height: 100%; height: 100%;
} }
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
.state { .state {
float: right; float: right;
color: #515a6e; color: @table-color;
padding: 5px 5px; padding: 5px 5px;
} }
......
pages/mainProcess/index.vue
View file @ 40e99520
...@@ -531,11 +531,12 @@ export default { ...@@ -531,11 +531,12 @@ export default {
} }
</script> </script>
<style lang='less'> <style lang='less'>
@import "../../assets/css/custom.less";
.ivu-table-wrapper { .ivu-table-wrapper {
overflow: inherit; overflow: inherit;
} }
.userstyle { .userstyle {
color: #515a6e; color:@table-color;
display: block; display: block;
width: 100%; width: 100%;
padding: 4px; padding: 4px;
......
pages/material/add.vue
View file @ 40e99520
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
v = 0; v = 0;
} }
// this.$set(this.entity.customProperties,u.filed,v) // this.$set(this.entity.customProperties,u.filed,v)
// this.entity[u.field] = "";
this.entity.json[u.field] = ""; this.entity.json[u.field] = "";
this.$set(this.entity, u.filed, v); this.$set(this.entity, u.filed, v);
}); });
......
pages/materiel/classification/index.vue
View file @ 40e99520
...@@ -374,6 +374,7 @@ export default { ...@@ -374,6 +374,7 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
@import "../../../assets/css/custom.less";
.classification { .classification {
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
...@@ -436,7 +437,7 @@ export default { ...@@ -436,7 +437,7 @@ export default {
line-height: 34px; line-height: 34px;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
color: #515a6e; color: @table-color;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
background: #ffffff; background: #ffffff;
......
pages/materiel/masterData/index.vue
View file @ 40e99520
<template> <template>
<div class="classification"> <div class="classification">
<Layout> <Layout>
<Sider width="300" v-if="showMenu"> <Sider width="300" v-if="showMenu">
<div class="p-list"> <div class="p-list">
<h3> <h3>
<Dropdown @on-click="clickItem"> <Dropdown @on-click="clickItem">
<a href="javascript:void(0)"> <a href="javascript:void(0)">
{{downName}} {{downName}}
<Icon type="ios-arrow-down"></Icon> <Icon type="ios-arrow-down"></Icon>
</a> </a>
<DropdownMenu slot="list"> <DropdownMenu slot="list">
<DropdownItem v-for="item in cityList" :key="item.id" :name="item.id">{{ item.name }}</DropdownItem> <DropdownItem
</DropdownMenu> v-for="item in cityList"
</Dropdown> :key="item.id"
<div class="fr mr10 mt10"> :name="item.id"
<ButtonGroup class="fr ddi" size="small"> >{{ item.name }}</DropdownItem>
<Button :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'" @click="toggle" title="展开/合并"></Button> </DropdownMenu>
<Button icon="md-refresh" title="刷新" @click="loadTree(model8,nodeInfo.codeRuleType)"></Button> </Dropdown>
<Button icon="md-rewind" title="收起" @click="hide"></Button> <div class="fr mr10 mt10">
</ButtonGroup> <ButtonGroup class="fr ddi" size="small">
</div> <Button
</h3> :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
<div class="search"> @click="toggle"
<Input search placeholder="关键字" v-model="keys" clearable /> title="展开/合并"
</div> ></Button>
<div class="fg"> <Button
<div class="tree"> icon="md-refresh"
<Tree :data="data" ref="tree" @on-select-change="change" :render="renderContent"></Tree> title="刷新"
</div> @click="loadTree(model8,nodeInfo.codeRuleType)"
</div> ></Button>
<Button icon="md-rewind" title="收起" @click="hide"></Button>
</ButtonGroup>
</div> </div>
</Sider> </h3>
<div v-if="!showMenu" class="show_menu"> <div class="search">
<a class="menu_play fr" @click="showMenuFn" title="展开"> <Input search placeholder="关键字" v-model="keys" clearable />
<Icon type="ios-arrow-forward" size="24" /> </div>
</a> <div class="fg">
<div class="tree">
<Tree :data="data" ref="tree" @on-select-change="change" :render="renderContent"></Tree>
</div>
</div>
</div> </div>
<Content :class="!showMenu?'con_bord':''"> </Sider>
<MasterData ref="dataTable" :nodeInfo="nodeInfo" @on-ok="ok" /> <div v-if="!showMenu" class="show_menu">
</Content> <a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<Content :class="!showMenu?'con_bord':''">
<MasterData ref="dataTable" :nodeInfo="nodeInfo" @on-ok="ok" />
</Content>
</Layout> </Layout>
</div> </div>
</template> </template>
<script> <script>
...@@ -48,325 +60,321 @@ import MasterData from "./masterData.vue"; ...@@ -48,325 +60,321 @@ import MasterData from "./masterData.vue";
import Api from "./api"; import Api from "./api";
export default { export default {
components: { components: {
MasterData, MasterData,
},
name: "masterData",
data() {
return {
model8: "",
type: "",
keys: "",
cityList: [],
expand: false,
list: [],
nodeInfo: {
categoryId: 0,
rootCategoryId: 0,
rootCategoryName: "",
ids: [],
addChange: true,
codeRuleId: 0,
codeRuleType: "",
},
downName: "请选择类型",
modal: false,
title: "新增",
curId: 0,
detail: null,
showMenu: true,
dataList: [],
rootCategoryId: null,
categoryId: null,
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
created() {
// this.loadTree();
this.listSlecet();
},
methods: {
clickItem(val) {
console.log(val);
this.nodeInfo.codeRuleId = val;
this.model8 = val;
this.cityList.forEach((e) => {
if (val == e.id) {
this.downName = e.name;
this.nodeInfo.codeRuleType = e.type;
}
});
this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
},
listSlecet() {
let data = {
conditions: [],
sortBy: "id",
isDesc: false,
};
Api.pagedSlecet(data).then((r) => {
this.cityList = r.result.items;
this.downName = this.cityList[0].name;
this.model8 = this.cityList[0].id;
this.nodeInfo.codeRuleId = this.cityList[0].id;
this.nodeInfo.codeRuleType = this.cityList[0].type;
this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
});
}, },
name: "masterData",
data() {
return {
model8: "",
type: "",
keys: "",
cityList: [],
expand: false,
list: [],
nodeInfo: {
categoryId: 0,
rootCategoryId: 0,
rootCategoryName: "",
ids: [],
addChange: true,
codeRuleId: 0,
codeRuleType: "",
},
downName: "请选择类型",
modal: false,
title: "新增",
curId: 0,
detail: null,
showMenu: true,
dataList: [],
rootCategoryId: null, showMenuFn() {
categoryId: null, //this.$Message.info("展开左侧树")
}; this.showMenu = true;
}, },
async fetch({ ok(row) {
store, this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
params // this.modal = false;
}) { // this.curId = 0;
await store.dispatch("loadDictionary"); // 加载数据字典 // if (row) {
// this.dataList.map((e, index) => {
// if (e.id == row.id) {
// this.$set(this.$refs.dataTable.dataColumns, index, row);
// }
// });
// }
}, },
created() { cancel() {
// this.loadTree(); this.curId = 0;
this.listSlecet(); this.modal = false;
}, },
methods: { renderContent(h, { root, node, data }) {
clickItem(val) { return h(
console.log(val); "span",
this.nodeInfo.codeRuleId = val; {
this.model8 = val; on: {
this.cityList.forEach((e) => { click: () => {
if (val == e.id) { this.handleSelect(root, data); //手动选择树节点
this.downName = e.name; },
this.nodeInfo.codeRuleType = e.type; },
}
});
this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
},
listSlecet() {
let data = {
conditions: [],
sortBy: "id",
isDesc: false,
};
Api.pagedSlecet(data).then((r) => {
this.cityList = r.result.items;
this.downName = this.cityList[0].name;
this.model8 = this.cityList[0].id;
this.nodeInfo.codeRuleId = this.cityList[0].id;
this.nodeInfo.codeRuleType = this.cityList[0].type;
this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
});
},
showMenuFn() {
//this.$Message.info("展开左侧树")
this.showMenu = true;
},
ok(row) {
this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
// this.modal = false;
// this.curId = 0;
// if (row) {
// this.dataList.map((e, index) => {
// if (e.id == row.id) {
// this.$set(this.$refs.dataTable.dataColumns, index, row);
// }
// });
// }
},
cancel() {
this.curId = 0;
this.modal = false;
},
renderContent(h, {
root,
node,
data
}) {
return h(
"span", {
on: {
click: () => {
this.handleSelect(root, data); //手动选择树节点
},
},
},
data.title +
"(" +
(data.totalMaterialCount == undefined ?
"0" :
data.totalMaterialCount) +
")"
);
}, },
handleSelect(root, data) { data.title +
let pid = -1; //定义最顶级id "(" +
var pname = ""; (data.totalMaterialCount == undefined
var upId = data.upId; ? "0"
let roots = root; : data.totalMaterialCount) +
")"
function addId(roots, upId) { );
roots.map((u) => { },
if (u.node.id == upId) { handleSelect(root, data) {
if (u.node.upId == 0) { let pid = -1; //定义最顶级id
pid = u.node.id; var pname = "";
pname = u.node.name; var upId = data.upId;
} else { let roots = root;
upId = u.node.upId;
addId(roots, upId);
}
}
});
}
addId(roots, upId); function addId(roots, upId) {
this.nodeInfo.categoryId = data.id; roots.map((u) => {
this.nodeInfo.rootCategoryName = data.name; if (u.node.id == upId) {
if (pid == -1) { if (u.node.upId == 0) {
this.nodeInfo.rootCategoryId = data.id; pid = u.node.id;
this.nodeInfo.rootCategoryName = data.name; pname = u.node.name;
} else {
this.nodeInfo.rootCategoryId = pid;
this.nodeInfo.rootCategoryName = pname;
}
},
loadTree(id, codeRuleType) {
let data = {
conditions: [{
fieldName: "codeRuleId",
fieldValue: id,
conditionalType: "Equal",
},
{
fieldName: "codeRuleType",
fieldValue: codeRuleType,
conditionalType: "Equal",
},
],
sortBy: "code",
isDesc: false,
};
Api.list(data).then((r) => {
var data = this.$u.toTree(
r.result,
0,
(u) => {
u.title = u.code + u.name;
u.value = u.id;
u.expand = true;
},
"upId"
);
this.list = this.$u.clone(data);
});
},
toggle() {
if (this.model8) {
this.expand = !this.expand;
} else {
this.$Message.error("请先选择类型");
}
},
change(v, b) {
if (b.level < b.ruleLevel && b.children.length > 0) {
this.nodeInfo.addChange = false;
} else { } else {
this.nodeInfo.addChange = true; upId = u.node.upId;
addId(roots, upId);
} }
let ids = []; }
ids.push(b.value); });
if (b.children) { }
addId(b.children);
function addId(data) { addId(roots, upId);
data.map((u) => { this.nodeInfo.categoryId = data.id;
ids.push(u.value); this.nodeInfo.rootCategoryName = data.name;
if (u.children) { if (pid == -1) {
addId(u.children); this.nodeInfo.rootCategoryId = data.id;
} this.nodeInfo.rootCategoryName = data.name;
}); } else {
} this.nodeInfo.rootCategoryId = pid;
this.nodeInfo.rootCategoryName = pname;
}
},
loadTree(id, codeRuleType) {
let data = {
conditions: [
{
fieldName: "codeRuleId",
fieldValue: id,
conditionalType: "Equal",
},
{
fieldName: "codeRuleType",
fieldValue: codeRuleType,
conditionalType: "Equal",
},
],
sortBy: "code",
isDesc: false,
};
Api.list(data).then((r) => {
var data = this.$u.toTree(
r.result,
0,
(u) => {
u.title = u.code + u.name;
u.value = u.id;
u.expand = true;
},
"upId"
);
this.list = this.$u.clone(data);
});
},
toggle() {
if (this.model8) {
this.expand = !this.expand;
} else {
this.$Message.error("请先选择类型");
}
},
change(v, b) {
if (b.level < b.ruleLevel && b.children.length > 0) {
this.nodeInfo.addChange = false;
} else {
this.nodeInfo.addChange = true;
}
let ids = [];
ids.push(b.value);
if (b.children) {
addId(b.children);
function addId(data) {
data.map((u) => {
ids.push(u.value);
if (u.children) {
addId(u.children);
} }
this.nodeInfo.ids = ids; });
}, }
hide() { }
this.showMenu = false; this.nodeInfo.ids = ids;
},
}, },
computed: { hide() {
data() { this.showMenu = false;
let items = this.$u.clone(this.list); },
let expand = this.expand; },
let result = []; computed: {
search(this.keys, items); data() {
let items = this.$u.clone(this.list);
let expand = this.expand;
let result = [];
search(this.keys, items);
function search(keys, data) { function search(keys, data) {
data.map((u) => { data.map((u) => {
if (keys.length < u.title) { if (keys.length < u.title) {
u.expand = expand; u.expand = expand;
result.push(u); result.push(u);
} else { } else {
u.expand = expand; u.expand = expand;
if (u.title.indexOf(keys) > -1) { if (u.title.indexOf(keys) > -1) {
result.push(u); result.push(u);
} else if (u.children) { } else if (u.children) {
search(keys, u.children); search(keys, u.children);
}
}
});
} }
return result; }
}, });
}
return result;
}, },
},
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../../assets/css/custom.less";
.classification { .classification {
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
.ivu-layout-sider { .ivu-layout-sider {
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
margin-right: 10px; margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15); box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 88vh; height: 88vh;
h4 { h4 {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
background: #eee; background: #eee;
padding-left: 10px; padding-left: 10px;
} }
.p-list { .p-list {
h3 { h3 {
height: 50px; height: 50px;
font-size: 14px; font-size: 14px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: bold; font-weight: bold;
line-height: 50px; line-height: 50px;
color: rgba(81, 90, 110, 1); color: rgba(81, 90, 110, 1);
background: rgba(245, 246, 250, 1); background: rgba(245, 246, 250, 1);
opacity: 1; opacity: 1;
padding-left: 10px; padding-left: 10px;
} }
.search { .search {
height: 50px; height: 50px;
padding: 5px 10px; padding: 5px 10px;
} }
.fg { .fg {
flex: none; flex: none;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
padding-left: 10px; padding-left: 10px;
} }
.tree { .tree {
height: calc(100vh - 215px); height: calc(100vh - 215px);
overflow: auto; overflow: auto;
} }
}
} }
}
.show_menu { .show_menu {
width: 30px; width: 30px;
height: 30px; height: 30px;
position: fixed; position: fixed;
top: 100px; top: 100px;
left: 0; left: 0;
z-index: 9; z-index: 9;
.menu_play { .menu_play {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 34px; line-height: 34px;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
color: #515a6e; color: @table-color;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
background: #ffffff; background: #ffffff;
box-shadow: #ccc 2px 2px 4px 1px; box-shadow: #ccc 2px 2px 4px 1px;
}
.menu_play:hover {
background-color: #2d8cf0;
color: white;
}
} }
.ivu-layout-content { .menu_play:hover {
// margin-left: 5px; background-color: #2d8cf0;
background: rgba(255, 255, 255, 1); color: white;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 88vh;
overflow-y: hidden;
} }
}
.ivu-layout-content {
// margin-left: 5px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 88vh;
overflow-y: hidden;
}
} }
</style> </style>
pages/order/bill/index.vue
View file @ 40e99520
...@@ -153,6 +153,7 @@ export default { ...@@ -153,6 +153,7 @@ export default {
}; };
</script> </script>
<style lang="less" > <style lang="less" >
@import "../../../assets/css/custom.less";
.order-bill { .order-bill {
.bill { .bill {
display: flex; display: flex;
...@@ -221,12 +222,12 @@ export default { ...@@ -221,12 +222,12 @@ export default {
height: 30px; height: 30px;
} }
div:nth-child(1) { div:nth-child(1) {
color: #515a6e; color: @table-color;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
} }
div:nth-child(2) { div:nth-child(2) {
color: #515a6e; color:@table-color;
font-size: 14px; font-size: 14px;
} }
div:nth-child(3), div:nth-child(3),
...@@ -246,7 +247,7 @@ export default { ...@@ -246,7 +247,7 @@ export default {
// float: left; // float: left;
div:nth-child(1), div:nth-child(1),
div:nth-child(2) { div:nth-child(2) {
color: #515a6e; color:@table-color;
} }
} }
.gong-dan1 { .gong-dan1 {
......
pages/produce/execute/execute.less
View file @ 40e99520
@import "../../../assets/css/custom.less";
.execute_box{ .execute_box{
//position: relative; //position: relative;
margin: 0px -10px; margin: 0px -10px;
...@@ -742,7 +742,7 @@ ...@@ -742,7 +742,7 @@
.div_card{ .div_card{
display: inline-block; display: inline-block;
// margin: 15px 43px; // margin: 15px 43px;
color: #515a6e; color: @table-color;
} }
} }
.zhuanx{ .zhuanx{
......
pages/technology/productMix/index.vue
View file @ 40e99520
...@@ -54,6 +54,7 @@ export default { ...@@ -54,6 +54,7 @@ export default {
}; };
</script> </script>
<style lang="less" > <style lang="less" >
@import "../../../assets/css/custom.less";
.product-mix { .product-mix {
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
...@@ -84,7 +85,7 @@ export default { ...@@ -84,7 +85,7 @@ export default {
line-height: 34px; line-height: 34px;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
color: #515a6e; color: @table-color;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
background: #ffffff; background: #ffffff;
......
styles/layout/basic-layout/layout.less
View file @ 40e99520
@import "../../../assets/css/custom.less";
@menuSideWidthCollapse: 80px; @menuSideWidthCollapse: 80px;
@menuHeaderHeight: 64px; @menuHeaderHeight: 64px;
@headerTriggerMinPadding: 0 12px; @headerTriggerMinPadding: 0 12px;
...@@ -406,7 +407,7 @@ ...@@ -406,7 +407,7 @@
margin-right: 6px; margin-right: 6px;
color: #808695; color: #808695;
&:hover{ &:hover{
color: #515a6e; color: @table-color;
} }
} }
.ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab-active{ .ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab-active{
......
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