Skip to content

M
mes-ui
Commit b0ac474a authored by 佟礼's avatar 佟礼
Browse files
Options

bug修改

parents 09ea4669 e99e1599
Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 47 deletions
components/page/dataGrid.vue
View file @ b0ac474a
......@@ -42,6 +42,7 @@
:height="tableHeight"
:draggable="draggable"
:size="size"
:row-key="rowKey"
ref="table"
class="tableCommon"
@on-expand="expand"
......@@ -235,6 +236,9 @@ export default {
span: {
type: Number,
default: 24
},
rowKey:{
type:[String,Number]
}
},
created() {
......
layouts/basic-layout/header-user/index.vue
View file @ b0ac474a
......@@ -7,6 +7,7 @@
@on-click="handleClick"
>
<Avatar size="small" :src="info.avatar" v-if="info.avatar" />
<Avatar size="small" style="background-color: #87d068" v-else-if="!info.avatar" icon="ios-person" />
<span class="i-layout-header-user-name" v-if="!isMobile">{{ info.name }}</span>
<DropdownMenu slot="list">
<i-link to="/basicData/userManagent/userInfo">
......
pages/aps/dispatch/dispatch.less
View file @ b0ac474a
......@@ -53,26 +53,22 @@
// padding-right: 0!important;
.man_body{
max-width: 185px;
label{
.checkUser{
border-radius: 24px;
width: 100%;
height: 50px;
line-height: 47px;
span.ivu-checkbox{
.ivu-checkbox-inner{
margin-top: -42px!important;
}
}
span{
// overflow: hidden;
// text-overflow: ellipsis;
// -o-text-overflow: ellipsis;
// white-space:nowrap;
// display: inline-block;
height: 50px;
}
.svg_name{
width: 50px;
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
white-space:nowrap;
display: block;
float: right;
width: 82%;
}
.svg{
width: 70px;
......
pages/aps/dispatch/index.vue
View file @ b0ac474a
......@@ -99,12 +99,14 @@
<!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
<Row :gutter="15">
<Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
<!-- <Tooltip :content="item.userName"> -->
<CheckboxGroup class="man_body">
<Checkbox v-model="item.checked" border class>
<span class="svg_name">{{item.userName}}</span>
<span class="svg">{{item.id}}</span>
<Checkbox v-model="item.checked" border class='checkUser'>
<span class="svg_name" :title='item.userName'>{{item.userName}}</span>
<!-- <span class="svg">{{item.id}}</span> -->
</Checkbox>
</CheckboxGroup>
<!-- </Tooltip> -->
</Col>
</Row>
</div>
......
pages/basicData/userManagent/userInfo.vue
View file @ b0ac474a
......@@ -4,7 +4,8 @@
<p slot="title">个人头像</p>
<div style="height:415px;">
<p style="text-align:center;padding-top:100px;">
<Avatar :src="avatorPath" size="150" />
<Avatar :src="avatorPath" size="150" v-if="avatorPath" />
<Avatar size="150" style="background-color: #87d068" v-else-if="!avatorPath" icon="ios-person" />
</p>
<p style="text-align:center;padding:10px;">
<Button @click="openModalAvatar">修改头像</Button>
......
pages/crm/statistical/costomer/approval.vue
View file @ b0ac474a
......@@ -31,7 +31,7 @@ export default {
{ key: 'schemaName', title: '类别', align: 'center' },
{ key: 'currentNodeName', title: '环节', align: 'center' },
{ key: 'nextNodeName', title: '下一环节', align: 'center' },
{ key: 'creationTime', title: '创建时间', align: 'center' },
{ key: 'creationTime', title: '创建时间', align: 'center',width:'190' },
{
key: 'id',
title: '操作',
......
pages/crm/statistical/index.vue
View file @ b0ac474a
......@@ -5,7 +5,8 @@
<div class="statistical_box">
<div class="statistical_top">
<div class="user_img fl">
<Avatar :src="avatorPath" size="90" />
<Avatar :src="avatorPath" size="90" v-if="avatorPath" />
<Avatar size="90" style="background-color: #87d068" v-else-if="!avatorPath" icon="ios-person" />
</div>
<div class="user_info fl">
<h3 class="mb10">您好，{{userData.userName}}，欢迎登录MES系统 !</h3>
......
pages/mesPlan/index.vue
View file @ b0ac474a
......@@ -15,13 +15,22 @@
</div>
</Sider>
<Content class="content">
<DataGrid :columns="columns" ref="grid" :action="action">
<DataGrid
:columns="columns"
ref="grid"
:data="listTemp"
@on-selection-change="onSelect"
:batch="true"
:border="false"
:rowKey="id"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入关键字订单编号/备注/任务节点要求/产品序号:No1~No99/产品名称/图号/批次号/项目号"
placeholder="请输入关键字订单编号/产品名称"
v-model="easySearch.keys.value"
style="width:240px;"
/>
</FormItem>
<FormItem>
......@@ -34,7 +43,10 @@
</template>
<template slot="buttons">
<Button type="primary" @click="addModal=true">创建</Button>
<Button type="primary" >修改</Button>
</template>
<template slot="batch">
<Button type="primary" class="mr10 ml10">订单派发</Button>
<Button type="primary" class="mr10 ml10">批量删除</Button>
</template>
</DataGrid>
<Modal v-model="addModal" title="新增" footer-hide width="1000">
......@@ -71,8 +83,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op:
"mesCode,productCode,productName,drawnNumber,batchNumber,projectNumber",
op: "mesCode,productName",
value: null
}
},
......@@ -81,25 +92,39 @@ export default {
detailModal: false,
deletelModal: false,
curId: 0,
id:"id",
columns: [
{
key: "selection",
type: "selection",
width: 50,
align: "center"
},
{
key: "id",
title: this.l("id"),
hide:true,
},
{
key: "mesCode",
title: this.l("mesCode"),
align: "left",
width: 240,
easy: true,
high: true
high: true,
tree: true
},
{
key: "taskType",
title: this.l("taskType"),
align: "left",
align: "center",
high: true,
code: "mes.mes_plan.task_type"
code: "plan.order.taskType"
},
{
key: "quantity",
title: this.l("quantity"),
align: "left",
align: "right",
high: true
},
{
......@@ -113,9 +138,9 @@ export default {
{
key: "status",
title: this.l("status"),
align: "left",
align: "center",
high: true,
code: "mes.mes_plan.status"
code: "plan.order.status"
},
{
key: "productCode",
......@@ -158,7 +183,7 @@ export default {
title: this.l("urgencyLevel"),
align: "left",
high: true,
code: "mes.mes_plan.urgency_level"
code: "plan.order.urgencyLevel"
},
{
key: "productingPreparationPeople",
......@@ -205,7 +230,7 @@ export default {
{
title: "操作",
key: "action",
width: 140,
width: 180,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -232,11 +257,199 @@ export default {
on: { click: () => this.remove(params.row.id) }
},
"删除"
),
h(
"op",
{
attrs: { oprate: "remove" },
on: { click: () => this.remove(params.row.id) }
},
"分解"
)
]);
}
}
],
listTemp: [
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: true,
children: [
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13_01",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false
}
]
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_14",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_15",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
}
],
treeData: [],
treeInputSearch: "",
ocolumn: [],
......@@ -379,11 +592,11 @@ export default {
let vkey = "mes_plan" + "." + key;
return this.$t(vkey) || key;
},
//new start
//new tree start
initTree() {
var sumData = [];
this.$http.order.getallselecttree().then(res => {
alert(JSON.stringify(res))
//alert(JSON.stringify(res))
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
......@@ -455,6 +668,18 @@ export default {
data.title
);
},
//new tree end
//list start
onSelect(a, b) {
alert(JSON.stringify(a));
//批量选择
let selectRows = a;
this.arrPartPkId = [];
// selectRows.forEach(e => {
// this.arrPartPkId.push(e.part_task_pk);
// });
}
//list end
}
};
</script>
......
pages/order/monitoring/record.vue
View file @ b0ac474a
<template>
<div class="record">
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false"></DataGrid>
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="820"></DataGrid>
<Modal v-model="detailModal" title="详情" width="800">
<Detail :eid="curId" />
</Modal>
......
pages/order/monitoring/speed.vue
View file @ b0ac474a
<template>
<div class="record">
<Table :columns="columns" :data="result" border></Table>
<DataGrid :columns="columns" :data="result" border :tool='false' :height="820"></DataGrid>
</div>
</template>
<script>
......@@ -97,9 +97,8 @@ export default {
{
key: "status",
type: "user",
title: this.l("status"),
code: "plan.order.status",
title: '工单状态',
code: "taskList.status",
align: "center"
}
]
......
pages/processManage/Process/processMain.vue
View file @ b0ac474a
......@@ -199,7 +199,6 @@ export default {
isview: false,
isshow: false,
ischangeshow: false,
selectpdefmid: 0,
oldformValidate: {},
processList: [],
......
pages/qc/dataTrace/index.vue
View file @ b0ac474a
......@@ -17,7 +17,7 @@
<div class="tableBox mb10" :style="{height:tbHeight}">
<div class="table">
<div v-if="listTask.length==0" class="wu_data">暂无数据</div>
<Row :gutter="16">
<Row :gutter="16" :style="{width:rowWidth}">
<Col span="6" v-for="(item,index) in listTask" :key="index">
<Card class="card">
<h3 slot="title">
......@@ -264,6 +264,7 @@ export default {
total: 0, //总数
conditions: []
},
rowWidth:'',
showPagesize: [20, 50, 100],
showModel: false,
list: [],
......@@ -381,6 +382,9 @@ export default {
.then(res => {
this.listTask = res.result.items;
this.search.total = res.result.totalCount;
if(this.listTask.length<4){
this.rowWidth = "100%"
}
});
},
searchModel() {
......
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