Skip to content

M
mes-ui
Commit bda9e48b authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents a6432029 7be98c2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 654 additions and 766 deletions
components/page/state.vue
View file @ bda9e48b
<template>
<div class="ib">
<div class="ib" v-if="!isMore">
<span v-if="type=='text'" :style="style">{{name}}</span>
<Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag>
<Badge v-if="type=='dot'" :color="tagcolor" :text="name" />
<Icon v-if="type=='icon'" :type="item.icon" :color="tagcolor" :title="name" size="24" />
<div class="ib">
<div class="ib" v-if="!isMore">
<span v-if="type=='text'" :style="style">{{name}}</span>
<Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag>
<Badge v-if="type=='dot'" :color="tagcolor" :text="name" />
<Icon v-if="type=='icon'" :type="item.icon" :color="tagcolor" :title="name" size="24" />
</div>
<div class="ib" v-else v-for="(li,i) in items" :key="i">
<span v-if="type=='text'" :style="li.style">{{li.name}}</span>
<Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag>
<Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" />&nbsp;
</div>
</div>
<div class="ib" v-else v-for="(li,i) in items" :key="i">
<span v-if="type=='text'" :style="li.style">{{li.name}}</span>
<Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag>
<Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" />
&nbsp;
</div>
</div>
</template>
<script>
export default {
name: 'state',
name: "state",
data() {
return {
name: '',
isMore:false,
name: "",
isMore: false,
item: {},
items: [],
data: []
}
};
},
props: {
default: {
type: String,
default: ''
default: ""
},
type: {
type: String,
default: 'text',
default: "text",
validator: function(value) {
return ['text', 'tag', 'dot','icon'].indexOf(value) != -1
return ["text", "tag", "dot", "icon"].indexOf(value) != -1;
}
},
code: {
......@@ -62,35 +59,39 @@ export default {
}
},
created() {
this.data = this.$store.getters.dictionaryByKey(this.code) || []
this.data = this.$store.getters.dictionaryByKey(this.code) || [];
},
methods: {
setName(v) {
if ((v+"").indexOf(',')==-1) {
var item
this.data.map((u) => {
if ((v + "").indexOf(",") == -1) {
var item;
this.data.map(u => {
if (u.code == v) {
item = u
item = u;
}
})
});
if (item) {
this.name = item.name
this.item = item
this.name = item.name;
this.item = item;
} else {
this.name = this.value
if (this.value == "undefined") {
this.name = ' '
} else {
this.name = this.value;
}
}
} else {
this.isMore=true;
var items=[];
var ul=(v+"").split(',')
this.data.map((u) => {
if (ul.indexOf(u.code)>-1) {
u.tagcolor=u.color|'default'
u.style={color: u.color|'inherit'}
items.push(u)
this.isMore = true;
var items = [];
var ul = (v + "").split(",");
this.data.map(u => {
if (ul.indexOf(u.code) > -1) {
u.tagcolor = u.color | "default";
u.style = { color: u.color | "inherit" };
items.push(u);
}
})
this.items=items;
});
this.items = items;
}
}
},
......@@ -99,36 +100,36 @@ export default {
if (
this.color &&
this.item &&
this.item.color != '' &&
this.item.color != "" &&
this.item.color != null
) {
return this.item.color
return this.item.color;
}
return 'default'
return "default";
},
style() {
if (!this.color) {
return {}
return {};
}
return {
color:
this.item && this.item.color != '' && this.item.color != null
this.item && this.item.color != "" && this.item.color != null
? this.item.color
: 'inherit'
}
: "inherit"
};
}
},
watch: {
value(v) {
this.setName(v)
// this.$forceUpdate()
this.setName(v);
// this.$forceUpdate()
},
data(v){
if(v.length>0){
this.setName(this.value)
this.$forceUpdate()
data(v) {
if (v.length > 0) {
this.setName(this.value);
this.$forceUpdate();
}
}
}
}
};
</script>
\ No newline at end of file
i18n/locale/zh-CN.js
View file @ bda9e48b
......@@ -1043,6 +1043,7 @@ export default {
multi_machine: '多台分配',
notes: '备注',
insert_flag: '插单',
important_flag:"插单",
outside_time: '外协时间',
discrete_percent: '离散百分比%',
taskseq_des: '',
......
layouts/basic-layout/product.vue
View file @ bda9e48b
<template>
<Layout class="product-layout">
<Header>
<span class="menu">
<a class="home">
<a class="menu">
<span class="home">
<Icon type="ios-keypad" />
<div class="top_menu_box">
<ul class="top_menu">
<li v-for="(item,i) in filterSider">
<ul class="row_ul">
<li class="title">{{item.title}}</li>
<li v-for="(li,j) in item.children">
<a >{{li.title}}</a>
</li>
</ul>
</li>
</ul>
<table class="t_table_box">
<tr>
<td class="t_title">
<a class="a_goIndex" @click="goIndex">
<b class="title">首页</b>
</a>
</td>
</tr>
<tr v-for="(item,i) in filterSider">
<td class="t_title">
<b class="title"
>{{item.title}}</b>
</td>
<td>
<ul class="table_row_ul">
<li v-for="(li,j) in item.children">
<a @click="goPage(li,j)" :class="{'active': li.id === isActive}">{{li.title}}</a>
</li>
</ul>
</td>
</tr>
</table>
</div>
</a>
</span>
</a>
<i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" />
<i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" />
<div class="header_right">
......@@ -88,6 +100,7 @@ export default {
},
data() {
return {
isActive:0,
showDrawer: false,
ticking: false,
headerVisible: true,
......@@ -266,7 +279,14 @@ export default {
this.keepAlivePush(pageName);
}
});
}
},
goPage(u) {
this.$router.push(u.path)
this.isActive = u.id
},
goIndex(){
this.$router.push("/")
},
},
mounted() {
document.addEventListener("scroll", this.handleScroll, { passive: true });
......@@ -279,10 +299,8 @@ export default {
}
};
</script>
<style lang="less">
.i-layout-header-trigger:hover {
background: #343b4a!important;
}
.product-layout {
.ivu-layout-header {
height: 50px;
......@@ -292,10 +310,7 @@ export default {
margin: 0 10px;
display: block;
float: left;
// position: absolute;
// top: 10px;
// left: 10px;
width: 60px;
width: 100px;
height: 60px;
.home {
position: relative;
......@@ -307,95 +322,99 @@ export default {
color: white;
line-height: 30px;
text-align: center;
-webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s;/* Safari */
-webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s; /* Safari */
transition: width 0.5s, height 0.5s, transform 0.5s;
i{
-webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s;/* Safari */
i {
-webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s; /* Safari */
transition: font-size 0.5s, margin 0.5s, transform 0.5s;
}
}
.top_menu_box{
.top_menu_box {
display: none;
border-radius: 5px;
position: absolute;
z-index: 99999;
left: 70%;
top: 66%;
left: 56%;
top: 57%;
min-width: 1084px;
min-height: 300px;
box-shadow: 0px 5px 17px 5px rgba(0,0,0,0.28);
background: #f5f6fa;
-webkit-transition: display 0.5s, -webkit-transform 0.5s;/* Safari */
transition: display 0.5s, transform 0.5s;
}
.top_menu {
border-radius: 4px;
color: #2680eb;
list-style: none;
text-align: left;
li:first-of-type{
ul:first-of-type{
li:first-of-type{
.t_table_box{
border-collapse:collapse;
border-radius: 5px;
tr:first-of-type {
border-top-right-radius: 5px;
td:first-of-type {
border-top-left-radius: 5px;
}
}
}
li {
width: 100%;
display: block;
// float: left;
// height: 47px;
line-height: 46px;
border-bottom: 1px solid #ccc;
ul {
width: 100%;
list-style: none;
li {
display: inline-block;
list-style: none;
margin-right: 10px;
width: 150px;
border: none;
a{
display: inline-block;
padding: 0 10px;
height: 30px;
tr:last-of-type {
border-bottom-right-radius: 5px;
td:first-of-type {
border-bottom-left-radius: 5px;
}
}
tr{
// line-height: 35px;
td{
padding: 9px 10px 0px;
.table_row_ul{
list-style: none;
border-bottom: 1px solid #E0E0E0;
text-align: left;
li{
list-style: none;
display: inline-block;
a {
float: left;
padding: 0px 10px;
line-height: 30px;
}
a:hover{
background: #2680EB;
color: white;
margin: 0px 6px;
border-radius: 4px;
}
a:hover{
background: #2680eb;
color: white;
}
a:visited{
background: #2680eb;
color: white;
}
a.active{
background: #2680eb;
color: white;
}
}
}
}
.title {
display: inline-block;
background: #515a6e;
width: 104px;
color: white;
text-align: center;
font-weight: bold;
}
.t_title{
min-width: 120px;
background: #515a6e;
.a_goIndex{
color: #fff;
}
.title:hover{
color: #ddd;
.title{
padding: 5px 10px;
}
}
}
}
.home:hover{
}
.menu:hover .home {
margin-top: 10px;
height: 60px;
width: 60px;
z-index: 88888;
}
.home:hover .top_menu_box {
.menu:hover .home .top_menu_box {
display: block;
}
.home:hover i{
.menu:hover .home i {
font-size: 33px;
margin: 13px 0 0;
}
}
.ivu-breadcrumb {
height: 50px;
line-height: 50px;
......@@ -411,6 +430,9 @@ export default {
height: 50px;
line-height: 50px;
}
.i-layout-header-trigger:hover {
background: #343b4a;
}
.ivu-tooltip {
color: white;
height: 50px;
......
layouts/default.vue
View file @ bda9e48b
......@@ -3,6 +3,7 @@
</template>
<script>
import MainLayout from "./basic-layout";
// import MainLayout from "./basic-layout/product";
// 配置
import Setting from "@/setting";
// 方法
......
pages/aps/aps/components/excute.vue
View file @ bda9e48b
......@@ -57,8 +57,8 @@ export default {
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{ title: " ", width: 130 },
{
key: "insert_flag",
title: this.l("insert_flag"),
key: "important_flag",//insert_flag?
title: this.l("important_flag"),
align: "center",
high: true,
width: 60,
......@@ -68,7 +68,7 @@ export default {
{
props: {
content:
params.row.insert_flag == 1 ? "取消插单" : "进行插单",
params.row.important_flag == 1 ? "取消插单" : "进行插单",
placement: "top"
},
class: "ico"
......@@ -77,11 +77,11 @@ export default {
h("Icon", {
attrs: {
type:
params.row.insert_flag == 1
params.row.important_flag == 1
? "ios-flag"
: "ios-flag-outline",
size: 20,
color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
color: params.row.important_flag == 1 ? "#2680EB" : "#aaa"
},
on: {
click: () => this.changeFlag(params.row.id, params.index)
......@@ -142,6 +142,13 @@ export default {
high: true,
width: 140,
hide: true
},
{
key:"first_equip",
title:this.l("first_equip"),
align:"left",
easy:true,
high:true,
},
{
key: "setup_time",
......@@ -158,9 +165,8 @@ export default {
{
key: "outside_time",
title: this.l("outside_time"),
align: "center",
align: "right",
high: true,
width: 140
},
{
key: "transport_time",
......@@ -185,7 +191,7 @@ export default {
{
key: "machine_rule",
title: this.l("machine_rule"),
align: "left",
align: "center",
easy: true,
high: true,
width: 140
......@@ -198,16 +204,16 @@ export default {
hide: true
},
{
key: "first_equip",
title: this.l("first_equip"),
key: "equip_type",
title: this.l("equip_type"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: "equip_type",
title: this.l("equip_type"),
key: "first_equip",
title: this.l("first_equip"),
align: "left",
easy: true,
high: true,
......@@ -237,30 +243,23 @@ export default {
{
key: "isdiscrete",
title: this.l("isdiscrete"),
align: "left",
align: "center",
easy: true,
high: true
},
{
key: "discrete_value",
title: this.l("discrete_value"),
align: "left",
align: "right",
high: true
},
{
key: "multi_machine",
title: this.l("multi_machine"),
align: "left",
align: "center",
easy: true,
high: true
},
{
key:"first_equip",
title:this.l("first_equip"),
align:"left",
easy:true,
high:true,
},
{
key: "notes",
title: this.l("notes"),
......@@ -384,7 +383,7 @@ export default {
//插单事件start----
changeFlag(id, index) {
this.rowIndex = index;
if (this.data1[this.rowIndex].insert_flag == 1) {
if (this.data1[this.rowIndex].important_flag == 1) {
this.insertTItle = "取消插单";
} else {
this.insertTItle = "插单";
......@@ -393,13 +392,12 @@ export default {
},
insertOk() {
//this.loadData(this.row)
if (this.data1[this.rowIndex].insert_flag == 1) {
if (this.data1[this.rowIndex].important_flag == 1) {
//根据插单数据状态进行插单或取消插单操作
this.data1[this.rowIndex].insert_flag = 0;
this.data1[this.rowIndex].important_flag = 0;
} else {
this.data1[this.rowIndex].insert_flag = 1;
this.data1[this.rowIndex].important_flag = 1;
}
this.setParsModal = false;
this.detailModal = false;
this.editModal = false;
......
pages/aps/aps/index.vue
View file @ bda9e48b
......@@ -326,8 +326,11 @@ export default {
this.deletedlModal = false;
this.apsModal = false;
},
onDragDrop(a, b) {
this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
onDragDrop(a, b) {//拖拽排序
//this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
let tempArray=this.list[a]
this.list.splice(a,1)
this.list.splice(b,0,tempArray)
},
openParms(id) {
this.addModal = true;
......
pages/aps/plan/dispatch.vue
View file @ bda9e48b
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col span="24">
<Col span="12">
<FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting">
<UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" />
</FormItem>
</Col>
<Col span="24">
<Col span="12">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
<DatePicker
v-model="entity.MainRoutingFinishDate"
......
pages/aps/plan/index.vue
View file @ bda9e48b
......@@ -13,7 +13,7 @@
<Input
search
enter-button
placeholder="请输入关键字订单编号/任务类型/甲方客户/3D打印承制单位(基础数据)/厂内责任机关(基础数据)/厂内主主体责任部门(基础数据)/备注/任务接点要求/上传文件名称/上传文件名称/外部图号/模型号/模型版本/甲方任务号/手输/手输/手输/设备/工艺方法/外包络尺寸（mm）/产品序号:No1~No99///批次号/项目号/紧急程度/材料名称/(APS)产品名称增强"
placeholder="请输入关键字订单编号/项目名称"
v-model="easySearch.keys.value"
@on-search="search"
/>
......@@ -86,7 +86,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op: "mesCode,taskType,stage,projectNumber,materialName",
op: "mesCode,projectNumber",
value: null
}
},
......@@ -197,7 +197,7 @@ export default {
{
key: "quantity",
title: this.l("quantity"),
align: "left",
align: "right",
high: true
},
{
......@@ -290,22 +290,6 @@ export default {
? "移入排产"
: ""
)
// h(
// 'op',
// {
// attrs: { oprate: 'edit' },
// on: { click: () => this.edit(params.row.id) }
// },
// '编辑'
// ),
// h(
// 'op',
// {
// attrs: { oprate: 'remove' },
// on: { click: () => this.remove(params.row.id) }
// },
// '删除'
// )
]);
}
}
......
pages/aps/plan/search.vue
View file @ bda9e48b
......@@ -118,7 +118,7 @@
</Col>
<Col span="8" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status">
<Dictionary code="mes_xingchi_plan.mes_order.status" v-model="condition.status.value"></Dictionary>
<Dictionary code="plan.order.status" v-model="condition.status.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.workHours.show">
......@@ -144,7 +144,7 @@
<Col span="8" v-if="condition.isSupportingFinish.show">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary
code="mes_xingchi_plan.mes_order.is_supporting_finish"
code="aps.plan.supportingStatus"
v-model="condition.isSupportingFinish.value"
></Dictionary>
</FormItem>
......@@ -304,7 +304,7 @@
<Col span="8" v-if="condition.mainRoutingSetStatus.show">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_set_status"
code="aps.plan.mainRoutingStatus"
v-model="condition.mainRoutingSetStatus.value"
></Dictionary>
</FormItem>
......@@ -386,7 +386,7 @@
</Col>
<Col span="8" v-if="condition.urgencyLevel.show">
<FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
<Input v-model="condition.urgencyLevel.value"></Input>
<Dictionary code="plan.order.urgencyLevel" v-model="condition.urgencyLevel.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.materialName.show">
......@@ -508,7 +508,7 @@ export default {
projectNumber: { op: 'Equal', value: null, show: true },
urgencyLevel: { op: 'Equal', value: null, show: true },
materialName: { op: 'Equal', value: null, show: true },
isPreschedule: { op: 'Equal', value: null, show: true },
isPreschedule: { op: 'Equal', value: null, show: false },
spareQty: { op: 'Equal', value: null, show: false },
demandStart: { op: 'Range', value: null, show: false },
demandFinish: { op: 'Range', value: null, show: false },
......
pages/processManage/Process/processMain.vue
View file @ bda9e48b
......@@ -406,8 +406,7 @@ export default {
var url =
`${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
productid +
'&routingType=' +
this.formValidate.routingType
'&routingType=0';
service.get(`${url}`).then((response) => {
this.RoutingList = response.result
})
......
pages/processManage/setProcess/index.vue
View file @ bda9e48b
......@@ -526,7 +526,7 @@ export default {
{
title: '主工艺',
title: '工艺规程',
key: 'mainRoutingID',
width: 120,
render: (h, params) => {
......@@ -610,7 +610,7 @@ export default {
key: 'materialbillID',
width: 120,
render: (h, params) => {
if (this.tabstatus == '1') {
if (params.row.mainRoutingID == 0) {
h('div', '')
} else {
let id = params.row.id
......@@ -1660,6 +1660,8 @@ export default {
ld.orderids = orderids.toString(',')
ld.formValidate.routingHeaderId = params.row.mainRoutingID
ld.formValidate.id = params.row.materialbillID
ld.loaddata()
......
pages/processManage/setProcess/processMain.vue
View file @ bda9e48b
......@@ -540,8 +540,7 @@ export default {
var url =
`${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
productid +
"&routingType=" +
this.formValidate.routingType;
"&routingType=0";
service.get(`${url}`).then(response => {
this.RoutingList = response.result;
});
......
pages/resource/material/placode/inventory.vue
View file @ bda9e48b
......@@ -29,8 +29,7 @@
<Row>
<Col span="12">
<FormItem :label="l('creator')">
<User :value="entity.creator"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
<User :value="creatorUserId"></User>
</FormItem>
</Col>
<Col span="12">
......@@ -189,8 +188,8 @@ export default {
objList.storeId = data.storeId
objList.storeTitle = data.storeTitle
objList.materialType = 2
objList.creator = this.entity.creator
objList.creatorUserId = this.entity.creatorUserId
objList.creator = this.creator
objList.creatorUserId = this.creatorUserId
this.listUp.push(objList)
}
})
......@@ -201,8 +200,8 @@ export default {
storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark,
materialType: 2,
creator: this.entity.creator,
creatorUserId: this.entity.creatorUserId
creator: this.creator,
creatorUserId: this.creatorUserId
},
item: this.listUp
}
......
pages/resource/material/powder/inventory.vue
View file @ bda9e48b
......@@ -29,8 +29,7 @@
<Row>
<Col span="12">
<FormItem :label="l('creator')">
<User :value="entity.creator"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
<User :value="creatorUserId"></User>
</FormItem>
</Col>
<Col span="12">
......@@ -181,8 +180,8 @@ export default {
objList.storeId = data.storeId
objList.storeTitle = data.storeTitle
objList.materialType = 1
objList.creator = this.entity.creator
objList.creatorUserId = this.entity.creatorUserId
objList.creator = this.creator
objList.creatorUserId = this.creatorUserId
this.listUp.push(objList)
}
})
......@@ -193,8 +192,8 @@ export default {
storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark,
materialType: 1,
creator: this.entity.creator,
creatorUserId: this.entity.creatorUserId
creator: this.creator,
creatorUserId: this.creatorUserId
},
item: this.listUp
}
......
pages/resource/material/scraper/inventory.vue
View file @ bda9e48b
......@@ -29,8 +29,7 @@
<Row>
<Col span="12">
<FormItem :label="l('creator')">
<User :value="entity.creator"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
<User :value="creatorUserId"></User>
</FormItem>
</Col>
<Col span="12">
......@@ -182,8 +181,8 @@ export default {
objList.storeId = data.storeId
objList.storeTitle = data.storeTitle
objList.materialType = 3
objList.creator = this.entity.creator
objList.creatorUserId = this.entity.creatorUserId
objList.creator = this.creator
objList.creatorUserId = this.creatorUserId
this.listUp.push(objList)
}
})
......@@ -194,8 +193,8 @@ export default {
storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark,
materialType: 3,
creator: this.entity.creator,
creatorUserId: this.entity.creatorUserId
creator: this.creator,
creatorUserId: this.creatorUserId
},
item: this.listUp
}
......
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