Skip to content

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

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

parents 551cbfd2 407d16b4
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 245 deletions
assets/css/base.less
View file @ 3ca3e7cf
......@@ -54,6 +54,9 @@ div::-webkit-scrollbar{
.fc-a{
justify-content: space-around;
}
.fc-ev{
justify-content: space-evenly;
}
.fd{
flex-direction: column;
}
......
i18n/locale/zh-CN.js
View file @ 3ca3e7cf
......@@ -1438,5 +1438,16 @@ export default {
productUrl:'产品图像url',
productUrlList:'产品图象列表',
},
order_list:{
mesCode:'订单编号',
status:'工单状态',
productName:'产品名称',
drawnNumber:'图号',
quantity:'生产数量',
beginTime:'开始时间',
endTime:'结束时间',
planEndTime:'计划结束时间',
action:'操作'
}
}
pages/crm/customer/index.vue
View file @ 3ca3e7cf
......@@ -5,7 +5,7 @@
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入关键字客户名称/客户简称/邮政地址/负责人/办公电话/手机/客户类型/客户区域/备注/客户编码/行业"
placeholder="请输入关键字客户名称/办公电话"
v-model="easySearch.keys.value"
search
enter-button
......@@ -55,7 +55,7 @@ export default {
easySearch: {
keys: {
op:
'name,abbre,address,principal,telephone,mobile,type,area,notes,code,trade',
'name,telephone',
value: null
}
},
......
pages/produce/execute/execute.less
View file @ 3ca3e7cf
......@@ -443,6 +443,12 @@
width: 460px;
}
}
.futer{
width: 100%;
height: 60px;
position: absolute;
bottom: 1px;
}
}
.tech_box{
......
pages/produce/execute/judgment/index.vue
View file @ 3ca3e7cf
......@@ -46,15 +46,15 @@
<div class="fei_right">
<p>问题原因：<Select style="width:80%">
<!-- <Option value="" class="option-text">请选择</Option> placeholder="选择问题原因" -->
<Option v-for="item in outerCodeList" :value="item" :key="item">{{ item }}</Option>
<Option v-for="item in problemList" :value="item.number" :key="item.index">{{ item.number }}</Option>
</Select></p>
<p>责任归属：<Select style="width:80%">
<!-- <Option value="" class="option-text">请选择</Option> placeholder="选择责任人" -->
<Option v-for="item in outerCodeList" :value="item" :key="item">{{ item }}</Option>
<Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
</Select></p>
</div>
</div>
<div class="star flex fc-m" >
<div class="futer flex fc-ev" >
<Button class="button" size='large' type="primary"> 提交</Button>
<Button class="button" size='large' type="primary"> 取消</Button>
</div>
......@@ -192,7 +192,16 @@ export default {
checked:false,
},
],
outerCodeList:[],
problemList:[
{ number:"问题描述01" , },
{ number:"问题描述02" , },
{ number:"问题描述03" , },
],
blameList:[
{ user:"责任人01" , },
{ user:"责任人02" , },
{ user:"责任人03" , },
],
}
},
created() {
......
pages/produce/orderlist.vue
View file @ 3ca3e7cf
......@@ -5,7 +5,6 @@
<DataGrid
:columns="columns"
ref="grid"
:data="list"
:batch="false"
:type="typeInfo"
:high="false"
......@@ -29,7 +28,7 @@
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template>
<template slot="card" slot-scope="{row}">
<div class="body" @click="toExecute">
<div class="body" @click="toExecute(row.id)">
<Row class="title-i">
<Col :span="10" class="order-code">{{row.productName}}</Col>
<Col :span="10" class="order-code">{{row.mesCode}}</Col>
......@@ -59,19 +58,21 @@
/>
</Col>
<Col span="16" class="row">
<p>开始时间：{{row.beginTime}}</p>
<p>{{l("beginTime")}}：{{row.beginTime}}</p>
<p>
<span v-if="getStatus(row.status)">计划</span>结束时间：{{row.endTime}}
<span v-if="getStatus(row.status)">{{l("planEndTime")}}：</span>
<span v-else>{{l("endTime")}}：</span>
{{row.endTime}}
</p>
<p v-if="getStatus(row.status)&&getTimes(row.endTime)>0">
剩余时间：
<OutputTime :value="getTimes(row.endTime)" style="display:inline"></OutputTime>
</p>
<p>生产数量：{{row.quantity}}</p>
<p>{{l("quantity")}}：{{row.quantity}}</p>
</Col>
</Row>
<Row class="rowBottom">
<Col span="14">图号：{{row.drawnNumber}}</Col>
<Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
<Col span="10" class="tr">
<Icon
type="md-alert"
......@@ -124,7 +125,7 @@ export default {
},
{
key: "status",
title: "工单状态",
title: this.l("status"),
align: "center",
high: true,
code: "taskList.status",
......@@ -132,33 +133,33 @@ export default {
},
{
key: "productName",
title: "产品名称",
title: this.l("productName"),
align: "left",
high: true
},
{
key: "drawnNumber",
title: "图号",
title: this.l("drawnNumber"),
align: "left",
high: true
},
{
key: "quantity",
title: "生产数量",
title: this.l("quantity"),
align: "right",
width: 120,
high: true
},
{
key: "beginTime",
title: "开始时间",
title: this.l("beginTime"),
align: "center",
width: 180,
high: true
},
{
key: "endTime",
title: "结束时间",
title: this.l("endTime"),
align: "center",
width: 180,
high: true
......@@ -182,228 +183,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",
iconInfo: "md-apps",
titleInfo: "卡片模式",
......@@ -421,9 +200,9 @@ export default {
search() {
this.$refs.grid.reload(this.easySearch);
},
toExecute() {
//跳转到对应操作页面
this.$router.push("/produce/execute");
toExecute(id) {
//跳转到对应操作页面 获取id:this.$route.query.id
this.$router.push({ path:"/produce/execute",query: { id:id}});
},
tdStyle(val) {
//动态根据状态值加载状态值对应的颜色
......@@ -443,7 +222,7 @@ export default {
if (this.typeInfo == "card") {
this.typeInfo = "table";
this.iconInfo = "md-list";
this.titleInfo = "卡片模式";
this.titleInfo = "列表模式";
} else {
this.typeInfo = "card";
this.iconInfo = "md-apps";
......@@ -493,7 +272,7 @@ export default {
return tempUrl;
},
l(key) {
let vkey = "mes_order" + "." + key;
let vkey = "order_list" + "." + 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