Skip to content

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

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

parents 9b30289a 2a5cc640
Show whitespace changes
Inline Side-by-side
Showing with 334 additions and 47 deletions
components/page/dataGrid.vue
View file @ 09c48bc7
......@@ -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() {
......
i18n/locale/zh-CN.js
View file @ 09c48bc7
......@@ -928,6 +928,11 @@ export default {
id: '',
part_task_pk: '计划编号',
mes_code: '计划编号',
urgency_level: '紧急程度',
batchnum: '批次号',
drawingnum: '图号',
project_no: '项目号',
product_name: '产品名称',
priority: '优先级',
plan_qty: '排产数量',
spare_qty: '备件数量',
......
layouts/basic-layout/product.vue
View file @ 09c48bc7
......@@ -48,12 +48,12 @@
<!-- {{}} -->
<Breadcrumb class="i-layout-header-breadcrumb" v-if="homeMenuItem==''">
<BreadcrumbItem to="/" class="white">
<Icon type="ios-home" title="首页"/>
<Icon type="ios-home" />首页
</BreadcrumbItem>
</Breadcrumb>
<Breadcrumb class="i-layout-header-breadcrumb" v-else-if="homeMenuItem!=''" separator=">">
<BreadcrumbItem to="/" class="white">
<Icon type="ios-home" title="首页"/>
<Icon type="ios-home" />首页
</BreadcrumbItem>
<BreadcrumbItem>
{{homeMenu}}
......@@ -248,8 +248,7 @@ export default {
}, 0);
},
$route(to, from) {
if (to.name === from.name) {
// 相同路由，不同参数，跳转时，重载页面
if (to.name === from.name) {// 相同路由，不同参数，跳转时，重载页面
if (Setting.sameRouteForceUpdate) {
this.handleReload();
}
......@@ -268,10 +267,7 @@ export default {
},
handleScroll() {
if (!this.headerHide) return;
const scrollTop =
document.body.scrollTop + document.documentElement.scrollTop;
const scrollTop = document.body.scrollTop + document.documentElement.scrollTop;
if (!this.ticking) {
this.ticking = true;
requestAnimation(() => {
......@@ -298,8 +294,7 @@ export default {
// todo $menuHead.handleGetMenuHeight();
}
},
handleReload() {
// 针对缓存的页面也生效
handleReload() {// 针对缓存的页面也生效
const isCurrentPageCache = this.keepAlive.indexOf(this.$route.name) > -1;
const pageName = this.$route.name;
if (isCurrentPageCache) {
......@@ -352,11 +347,11 @@ export default {
.i-layout-header-breadcrumb .white .ivu-breadcrumb-item-link {
color: #ffffff!important;//wheat
}
.ivu-icon-ios-home{
font-size: 20px;
}
.white{
color: #ffffff!important;
// a{
// color: #ffffff!important;
// }
}
.product-layout {
.i-layout-content {
......@@ -417,7 +412,6 @@ export default {
}
}
tr {
// line-height: 35px;
td {
padding: 9px 10px 0px;
.table_row_ul {
......
pages/aps/aps/index.vue
View file @ 09c48bc7
......@@ -146,16 +146,50 @@ export default {
category: "icon"
},
{
key: "mes_code",
key: "mesCode",
title: this.l("mes_code"),
align: "left",
high: true,
width: 240,
},
{
key: "product_name",
title: this.l("product_name"),
align: "left",
high: true
},
{
key: "drawingnum",
title: this.l("drawingnum"),
align: "left",
high: true
},
{
key: "project_no",
title: this.l("project_no"),
align: "left",
high: true
},
{
key: "batchnum",
title: this.l("batchnum"),
align: "left",
high: true
},
{
key: "urgency_level",
title: this.l("urgency_level"),
align: "left",
high: true,
code: "plan.order.urgencyLevel",
width: 100,
},
{
key: "priority",
title: this.l("priority"),
align: "left",
high: true,
hide: true,
render: (h, params) => {
return h("span", {}, params.index + 1);
}
......@@ -163,14 +197,15 @@ export default {
{
key: "plan_qty",
title: this.l("plan_qty"),
align: "left",
align: "right",
width: 100,
high: true,
sortable: true
},
{
key: "spare_qty",
title: this.l("spare_qty"),
align: "left",
align: "right",
width: 100,
high: true
},
{
......@@ -180,7 +215,7 @@ export default {
high: true,
hide: true,
resizable: true,
width: 140
width: 150
},
{
key: "plan_finish",
......@@ -190,7 +225,7 @@ export default {
hide: true,
sortable: true,
resizable: true,
width: 140
width: 150
},
{
key: "notes",
......@@ -205,7 +240,7 @@ export default {
title: this.l("demand_start"),
align: "center",
resizable: true,
width: 140
width: 150
},
{
key: "demand_finish",
......@@ -213,7 +248,7 @@ export default {
align: "center",
high: true,
resizable: true,
width: 140
width: 150
},
{
key: "badjustflag",
......@@ -235,7 +270,7 @@ export default {
icon: "md-options",
type: "icon",
title: "工序参数设置",
oprate: "edit",
oprate: "edit"
},
on: { click: () => this.openAddModel(2, params.row) }
}),
......
pages/crm/statistical/costomer/approval.vue
View file @ 09c48bc7
......@@ -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/implement/components/entryrecordlist.vue
View file @ 09c48bc7
......@@ -22,9 +22,9 @@
</Select>
</template>
<Button type="primary" @click="QcCardChecker(1)" class="title_btn ml10">操作员</Button>
<Button type="primary" @click="QcCardChecker(2)" class="title_btn ml10">互检员</Button>
<Button type="primary" @click="SendCheck()" class="title_btn ml10">送检</Button>
<Button type="primary" @click="SendCheckRecord()" class="title_btn ml10">送检记录</Button>
<Button type="primary" :disabled="ishavhj" @click="QcCardChecker(2)" class="title_btn ml10">互检员</Button>
<Button type="primary" :disabled="ishavzj" @click="SendCheck()" class="title_btn ml10">送检</Button>
<Button type="primary" :disabled="ishavzj" @click="SendCheckRecord()" class="title_btn ml10">送检记录</Button>
</div>
<div class="table01">
<Table ref="table" border class="tableCommon" :height="taHeight" :columns="recordcolumn" :data="recorddata">
......@@ -237,6 +237,8 @@ export default {
entryModel: {},
disabled: false,
look: '查看',
ishavhj: true,
ishavzj: true,
taHeight:'',
entryrecordfilesModal: false,
entryrecorddataModal: false,
......@@ -478,6 +480,23 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.recorddata = response.result
let gh = this.recorddata.filter(function(obj) {
return obj.check_type === 2
})
if (gh != null && gh.length > 0) {
this.ishavhj = false
} else {
this.ishavhj = true
}
let gh1 = this.recorddata.filter(function(obj) {
return obj.check_type === 3 || obj.check_type === 4
})
if (gh1 != null && gh1.length > 0) {
this.ishavzj = false
} else {
this.ishavzj = true
}
})
},
handleselfCheckAll() {
......
pages/mesPlan/index.vue
View file @ 09c48bc7
......@@ -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>
......@@ -33,16 +42,20 @@
<Search />
</template>
<template slot="buttons">
<Button type="primary" @click="addModal=true">新增</Button>
<Button type="primary" @click="addModal=true">创建</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>
<Modal v-model="addModal" title="新增" footer-hide width="1000">
<Add @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="editModal" title="编辑" footer-hide>
<Modal v-model="editModal" title="编辑" footer-hide width="1000">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" width="1000">
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......@@ -70,8 +83,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op:
"mesCode,productCode,productName,drawnNumber,batchNumber,projectNumber",
op: "mesCode,productName",
value: null
}
},
......@@ -80,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
},
{
......@@ -112,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",
......@@ -157,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",
......@@ -204,7 +230,7 @@ export default {
{
title: "操作",
key: "action",
width: 140,
width: 180,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -231,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: [],
......@@ -378,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]);
......@@ -454,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/qc/dataTrace/index.vue
View file @ 09c48bc7
......@@ -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