Skip to content

M
mes-ui
Commit 01fc380e authored by renjintao's avatar renjintao
Browse files
Options

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

parents 30a44fb7 69b80021
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 81 deletions
pages/order/monitoring/record.vue
View file @ 01fc380e
......@@ -2,7 +2,14 @@
<div class="record">
<Tabs value="name1" @on-click="tabSwitch">
<TabPane label="订单暂停记录" name="name1">
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="tdHeight"></DataGrid>
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:tool="false"
:height="tdHeight"
></DataGrid>
</TabPane>
<TabPane label="工单暂停记录" name="name2">
<DataGrid
......@@ -25,16 +32,16 @@ import Detail from "./detail";
export default {
name: "record",
components: {
Detail
Detail,
},
data() {
return {
detailModal: false,
action: Api.record,
tdHeight: "",
condition: {
easySearch: {
orderId: { op: "Equal", value: this.eid },
keys: { op: "pauseCause,", value: null }
keys: { op: "pauseCause,", value: null },
},
data: [],
curId: 0,
......@@ -44,7 +51,7 @@ export default {
title: "序号",
type: "index",
width: 70,
align: "center"
align: "center",
},
{
key: "mesCode",
......@@ -56,17 +63,17 @@ export default {
"a",
{
attrs: {
oprate: "detail"
oprate: "detail",
},
on: { click: () => this.detail(params.row.id) }
on: { click: () => this.detail(params.row.id) },
},
params.row.mesCode
)
),
},
{
key: "productName",
title: this.l("productName"),
align: "left"
align: "left",
},
// {
// key: 'orderId',
......@@ -78,14 +85,14 @@ export default {
key: "pauseCause",
title: this.l("pauseCause"),
align: "left",
code: "mes_xingchi_plan.order_material.pauseCause"
code: "mes_xingchi_plan.order_material.pauseCause",
},
{
key: "creationTime",
title: this.l("creationTime"),
easy: true,
high: true,
align: "left"
align: "left",
},
{
......@@ -93,14 +100,14 @@ export default {
title: this.l("creator"),
easy: true,
high: true,
align: "left"
align: "left",
},
{
key: "laster",
title: this.l("laster"),
easy: true,
high: true,
align: "left"
align: "left",
},
{
key: "lastModificationTime",
......@@ -115,7 +122,7 @@ export default {
? ""
: params.row.lastModificationTime
);
}
},
},
{
......@@ -123,8 +130,8 @@ export default {
type: "user",
title: this.l("relatedPerson"),
align: "left",
high: true
}
high: true,
},
],
columnsProcess: [
{
......@@ -132,33 +139,33 @@ export default {
title: "工艺文件编号",
align: "left",
width: 200,
tooltip: true
tooltip: true,
},
{
key: "processname",
title: "工艺名称",
align: "left",
tooltip: true
tooltip: true,
},
{
key: "taskSeq",
title: "工序号",
align: "left",
width: 90
width: 90,
},
{
key: "detailName",
title: "工序名称",
align: "left",
width: 350,
tooltip: true
tooltip: true,
},
{
key: "desc",
title: "暂停原因",
align: "left",
tooltip: true
tooltip: true,
},
{
key: "creatorUserId",
......@@ -166,24 +173,26 @@ export default {
align: "left",
high: true,
width: 180,
type: "user"
type: "user",
},
{
key: "creationTime",
title: "暂停时间",
align: "center",
width: 180
}
width: 180,
},
],
list: []
list: [],
};
},
props: {
eid: Number
eid: Number,
},
mounted() {
this.$refs.grid.reload(this.easySearch);
this.loadList();
// if (this.eid) {
// this.loadList();
// }
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -201,17 +210,17 @@ export default {
methods: {
loadList() {
let params = {
FilterText: 'order_id="' + this.eid + '"'
FilterText: 'order_id="' + this.eid + '"',
};
Api.pauseCauseGetpaged(params)
.then(res => {
.then((res) => {
if (res.success) {
this.list = res.result.items;
} else {
this.$Message.error("获取数据失败");
}
})
.catch(err => {
.catch((err) => {
this.$Message.error("连接失败");
});
},
......@@ -231,15 +240,17 @@ export default {
detail(id) {
this.detailModal = true;
this.curId = id;
}
},
},
watch: {
eid(v) {
this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition);
this.loadList();
}
}
if (v) {
this.easySearch.orderId.value = v;
this.$refs.grid.reload(this.easySearch);
// this.loadList();
}
},
},
};
</script>
<style lang='less'>
......
pages/order/monitoring/suspend.vue
View file @ 01fc380e
......@@ -135,11 +135,6 @@ export default {
return this.$t(key);
},
},
watch: {
"entity.relatedPerson"(v) {
alert(typeof v);
// this.entity = this.$u.clone(this.v)
},
},
watch: {},
};
</script>
\ No newline at end of file
pages/qc/certificate/endIssued/pdfDetail.vue
View file @ 01fc380e
......@@ -78,9 +78,9 @@
</div>
<div style="margin-top:20px;">本合格证无检验专用章无效 (版本：MB.FFGGHJKLL)</div>
<Row style="margin-top:5px;">
<Col :span="8">地址：北京市海淀区知春路63号</Col>
<Col :span="8" style="text-align:center;">电话：010-68378079</Col>
<Col :span="8" style="text-align:right;">邮编：100190</Col>
<Col :span="10">地址：</Col>
<Col :span="8" >电话：</Col>
<Col :span="6" >邮编：</Col>
</Row>
</div>
</div>
......
pages/qc/certificate/endIssued/qcInfos.vue
View file @ 01fc380e
<template>
<div class="pdf-detail">
<div class="cerioficate-pdf-detail">
<div class="bian-hao">产品合格证编号：{{results.serialNumber}}</div>
<div class="bian-hao">产品合格证编号：{{ results.serialNumber }}</div>
<div class="body-d">
<Row class="row-border right-border">
<Col :span="4" class="col-border">用户单位</Col>
<Col :span="20" class="col-border">{{results.userUnit}}</Col>
<Col :span="20" class="col-border">{{ results.userUnit }}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">任务依据</Col>
<Col :span="20" class="col-border">{{results.taskBased}}</Col>
<Col :span="20" class="col-border">{{ results.taskBased }}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">产品名称</Col>
<Col :span="8" class="col-border">{{results.productName}}</Col>
<Col :span="8" class="col-border">{{ results.productName }}</Col>
<Col :span="4" class="col-border">产品状态</Col>
<Col :span="8" class="col-border">{{results.productStatus}}</Col>
<Col :span="8" class="col-border">{{ results.productStatus }}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">产品编号</Col>
<Col :span="8" class="col-border">{{results.productSerialNumber}}</Col>
<Col :span="8" class="col-border">{{
results.productSerialNumber
}}</Col>
<Col :span="4" class="col-border">原材料批号</Col>
<Col :span="8" class="col-border">{{results.materialSerialNumber}}</Col>
<Col :span="8" class="col-border">{{
results.materialSerialNumber
}}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">原材料编号</Col>
<Col :span="8" class="col-border">{{results.materialCode}}</Col>
<Col :span="8" class="col-border">{{ results.materialCode }}</Col>
<Col :span="4" class="col-border">产品代号（图号）</Col>
<Col :span="8" class="col-border">{{results.productCode}}</Col>
<Col :span="8" class="col-border">{{ results.productCode }}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">原材料合格证编号</Col>
<Col :span="8" class="col-border">{{results.materialCertificationNumber}}</Col>
<Col :span="8" class="col-border">{{
results.materialCertificationNumber
}}</Col>
<Col :span="4" class="col-border">数量</Col>
<Col :span="8" class="col-border">{{results.productQuantity}}</Col>
<Col :span="8" class="col-border">{{ results.productQuantity }}</Col>
</Row>
<!-- <Row class="row-border right-border">
<Col :span="4" class="col-border">增材制造批次号</Col>
......@@ -50,30 +56,40 @@
<Col :span="5" class="col-border">结论</Col>
<Col :span="5" class="col-border">备注</Col>
</Row>
<Row class="row-border right-border" v-for="(item,index) in results.items" :key="index">
<Col :span="1" class="col-border">{{index+1}}</Col>
<Col :span="5" class="col-border">{{item.name}}</Col>
<Col :span="5" class="col-border">{{item.require}}</Col>
<Col :span="3" class="col-border">{{item.result}}</Col>
<Col :span="5" class="col-border">{{item.conclusion}}</Col>
<Col :span="5" class="col-border">{{item.remark}}</Col>
<Row
class="row-border right-border"
v-for="(item, index) in results.items"
:key="index"
>
<Col :span="1" class="col-border">{{ index + 1 }}</Col>
<Col :span="5" class="col-border">{{ item.name }}</Col>
<Col :span="5" class="col-border">{{ item.require }}</Col>
<Col :span="3" class="col-border">{{ item.result }}</Col>
<Col :span="5" class="col-border">{{ item.conclusion }}</Col>
<Col :span="5" class="col-border">{{ item.remark }}</Col>
</Row>
<Row class="row-border right-border">
<Col :span="4" class="col-border">结论</Col>
<Col :span="20" class="col-border">{{results.conclusion}}</Col>
<Col :span="20" class="col-border">{{ results.conclusion }}</Col>
</Row>
<Row class="row-border right-border bottom-border">
<Row class="row-border right-border bottom-border">
<Col :span="4" class="col-border">检验员 / 时间</Col>
<Col :span="8" class="col-border">{{results.examUser}} {{results.examDate}}</Col>
<Col :span="8" class="col-border"
>{{ results.examUser }} {{ results.examDate }}</Col
>
<Col :span="4" class="col-border">批准人 / 时间</Col>
<Col :span="8" class="col-border">{{results.approveUser}} {{results.approveDate}}</Col>
<Col :span="8" class="col-border"
>{{ results.approveUser }} {{ results.approveDate }}</Col
>
</Row>
</div>
<div style="margin-top:20px;">本合格证无检验专用章无效 (版本：MB.FFGGHJKLL)</div>
<Row style="margin-top:5px;">
<Col :span="8">地址：北京市海淀区知春路63号</Col>
<Col :span="8" style="text-align:center;">电话：010-68378079</Col>
<Col :span="8" style="text-align:right;">邮编：100190</Col>
<div style="margin-top: 20px">
本合格证无检验专用章无效 (版本：MB.FFGGHJKLL)
</div>
<Row style="margin-top: 5px">
<Col :span="10">地址：</Col>
<Col :span="8">电话：</Col>
<Col :span="6">邮编：100190</Col>
</Row>
</div>
</div>
......@@ -81,21 +97,21 @@
<script>
export default {
name: '',
props: ['results'],
name: "",
props: ["results"],
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {}
return {};
},
methods: {
l(key) {
key = 'waitOpened' + '.' + key
return this.$t(key)
}
}
}
key = "waitOpened" + "." + key;
return this.$t(key);
},
},
};
</script>
<style lang="less" scoped>
.pdf-detail {
......
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