Skip to content

M
mes-ui
Commit f01d4d91 authored by 康振飞's avatar 康振飞
Browse files
Options

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

parents ca3126bb 25cd92c6
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 240 deletions
i18n/locale/zh-CN.js
View file @ f01d4d91
...@@ -1438,5 +1438,15 @@ export default { ...@@ -1438,5 +1438,15 @@ export default {
productUrl:'产品图像url', productUrl:'产品图像url',
productUrlList:'产品图象列表', productUrlList:'产品图象列表',
},
order_list:{
mesCode:'订单编号',
status:'工单状态',
productName:'产品名称',
drawnNumber:'图号',
quantity:'生产数量',
beginTime:'开始时间',
endTime:'结束时间',
action:'操作'
} }
} }
pages/crm/customer/index.vue
View file @ f01d4d91
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input
placeholder="请输入关键字客户名称/客户简称/邮政地址/负责人/办公电话/手机/客户类型/客户区域/备注/客户编码/行业" placeholder="请输入关键字客户名称/办公电话"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
search search
enter-button enter-button
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
easySearch: { easySearch: {
keys: { keys: {
op: op:
'name,abbre,address,principal,telephone,mobile,type,area,notes,code,trade', 'name,telephone',
value: null value: null
} }
}, },
......
pages/produce/orderlist.vue
View file @ f01d4d91
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<DataGrid <DataGrid
:columns="columns" :columns="columns"
ref="grid" ref="grid"
:data="list"
:batch="false" :batch="false"
:type="typeInfo" :type="typeInfo"
:high="false" :high="false"
...@@ -29,7 +28,7 @@ ...@@ -29,7 +28,7 @@
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button> <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template> </template>
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div class="body" @click="toExecute"> <div class="body" @click="toExecute(row.id)">
<Row class="title-i"> <Row class="title-i">
<Col :span="10" class="order-code">{{row.productName}}</Col> <Col :span="10" class="order-code">{{row.productName}}</Col>
<Col :span="10" class="order-code">{{row.mesCode}}</Col> <Col :span="10" class="order-code">{{row.mesCode}}</Col>
...@@ -59,7 +58,7 @@ ...@@ -59,7 +58,7 @@
/> />
</Col> </Col>
<Col span="16" class="row"> <Col span="16" class="row">
<p>开始时间：{{row.beginTime}}</p> <p>{{l("beginTime")}}：{{row.beginTime}}</p>
<p> <p>
<span v-if="getStatus(row.status)">计划</span>结束时间：{{row.endTime}} <span v-if="getStatus(row.status)">计划</span>结束时间：{{row.endTime}}
</p> </p>
...@@ -67,11 +66,11 @@ ...@@ -67,11 +66,11 @@
剩余时间： 剩余时间：
<OutputTime :value="getTimes(row.endTime)" style="display:inline"></OutputTime> <OutputTime :value="getTimes(row.endTime)" style="display:inline"></OutputTime>
</p> </p>
<p>生产数量：{{row.quantity}}</p> <p>{{l("quantity")}}：{{row.quantity}}</p>
</Col> </Col>
</Row> </Row>
<Row class="rowBottom"> <Row class="rowBottom">
<Col span="14">图号：{{row.drawnNumber}}</Col> <Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
<Col span="10" class="tr"> <Col span="10" class="tr">
<Icon <Icon
type="md-alert" type="md-alert"
...@@ -124,7 +123,7 @@ export default { ...@@ -124,7 +123,7 @@ export default {
}, },
{ {
key: "status", key: "status",
title: "工单状态", title: this.l("status"),
align: "center", align: "center",
high: true, high: true,
code: "taskList.status", code: "taskList.status",
...@@ -132,33 +131,33 @@ export default { ...@@ -132,33 +131,33 @@ export default {
}, },
{ {
key: "productName", key: "productName",
title: "产品名称", title: this.l("productName"),
align: "left", align: "left",
high: true high: true
}, },
{ {
key: "drawnNumber", key: "drawnNumber",
title: "图号", title: this.l("drawnNumber"),
align: "left", align: "left",
high: true high: true
}, },
{ {
key: "quantity", key: "quantity",
title: "生产数量", title: this.l("quantity"),
align: "right", align: "right",
width: 120, width: 120,
high: true high: true
}, },
{ {
key: "beginTime", key: "beginTime",
title: "开始时间", title: this.l("beginTime"),
align: "center", align: "center",
width: 180, width: 180,
high: true high: true
}, },
{ {
key: "endTime", key: "endTime",
title: "结束时间", title: this.l("endTime"),
align: "center", align: "center",
width: 180, width: 180,
high: true high: true
...@@ -182,228 +181,6 @@ export default { ...@@ -182,228 +181,6 @@ export default {
} }
} }
], ],
list: [
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 1
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 2
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 3
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 4
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 5
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 6
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 8
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 11
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 1,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 12
},
{
actualBeginTime: "2020-05-12 14:58:17",
img: "/2020/5/12/b8cbee7b-6faa-4cfa-a05a-aa7a7f13b8d7.png",
id: 1,
orderIDs: "5",
platesnum: 0,
processcode: "ZGY_20200315_2",
processname: "增材制造主工艺规程",
quantity: 13,
routing_header_id: 181,
routing_type: 1,
actualStartDate: "2020-05-12 14:58:17",
demandFinishDate: "2020-05-10 23:59:59",
demandStartDate: "2020-05-09 00:00:01",
mesCode: "DDBH_20200509_2",
order_id: 5,
picnumber: 0,
productName: "气源分配器壳体",
drawNum: "JPEG4620",
taskTypeName: "正式计划",
status: 14
}
],
typeInfo: "card", typeInfo: "card",
iconInfo: "md-apps", iconInfo: "md-apps",
titleInfo: "卡片模式", titleInfo: "卡片模式",
...@@ -421,9 +198,9 @@ export default { ...@@ -421,9 +198,9 @@ export default {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
}, },
toExecute() { toExecute(id) {
//跳转到对应操作页面 //跳转到对应操作页面 获取id:this.$route.query.id
this.$router.push("/produce/execute"); this.$router.push({ path:"/produce/execute",query: { id:id}});
}, },
tdStyle(val) { tdStyle(val) {
//动态根据状态值加载状态值对应的颜色 //动态根据状态值加载状态值对应的颜色
...@@ -443,7 +220,7 @@ export default { ...@@ -443,7 +220,7 @@ export default {
if (this.typeInfo == "card") { if (this.typeInfo == "card") {
this.typeInfo = "table"; this.typeInfo = "table";
this.iconInfo = "md-list"; this.iconInfo = "md-list";
this.titleInfo = "卡片模式"; this.titleInfo = "列表模式";
} else { } else {
this.typeInfo = "card"; this.typeInfo = "card";
this.iconInfo = "md-apps"; this.iconInfo = "md-apps";
...@@ -493,7 +270,7 @@ export default { ...@@ -493,7 +270,7 @@ export default {
return tempUrl; return tempUrl;
}, },
l(key) { l(key) {
let vkey = "mes_order" + "." + key; let vkey = "order_list" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
} }
} }
......
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