Commit aec20ba0 authored by kangzhenfei's avatar kangzhenfei

Merge branch 'product-kk' into product

parents ceee37a7 498ac04a
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="6" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="6" :name="l('mesCode')">{{entity.mesCode}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/>
<!-- <Footer :idVal="detailId" :footerStatu="footerStatu" @showModalCheckOk='modalCheckOk=true'></Footer> -->
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="8" :name="l('code')">{{formValidate.code}}</Filed>
<Filed :span="8" :name="l('creationTime')">{{formValidate.creationTime}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="8" :name="l('code')">{{formValidate.code}}</Filed>
<Filed :span="8" :name="l('creationTime')">{{formValidate.creationTime}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="8" :name="l('code')">{{formValidate.code}}</Filed>
<Filed :span="8" :name="l('creationTime')">{{formValidate.creationTime}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<style lang="less" scope>
@import "../shen.less";
</style>
<template>
<div class="new-detail">
<Row>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" />
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" style="width:80%"/>
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="8" :name="l('documentCode')">{{processData.orderMaterial.code}}</Filed>
<Filed :span="8" :name="l('platesNum')">{{processData.orderMaterial.platesnum}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj"/>
<div class="footers" v-if="footerStatu === '2'">
......
<template>
<div class="detail"style="width:90%;margin:0 auto" >
<div class="detail table-detail">
<Row>
<Filed :span="12" :name="'工艺更改单'">{{results.changeorder_code}}</Filed>
<Filed :span="12" :name="'提出人'">{{results.propose_user_name}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<!-- <Filed :span="8" :name="l('unqualifiedCode')">{{entity.unqualified_order_code}}</Filed>
<Filed :span="8" :name="l('department')">{{entity.department_name}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/>
<div class="footers" v-if="footerStatu === '2'">
......
<template>
<div class="detail" style="width:90%;margin:0 auto">
<div class="detail table-detail">
<Row>
<Filed :span="12" :name="'生产协调单'">{{results.technical_coordination_code}}</Filed>
<Filed :span="12" :name="'任务号'">{{results.taskCode}}</Filed>
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/>
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
<template>
<div class="pdf-detail" style="width:85%;margin:0 auto">
<div class="pdf-detail table-detail">
<div class="cerioficate-pdf-detail">
<div class="bian-hao">产品合格证编号:{{results.serialNumber}}</div>
<div class="body-d">
......@@ -120,7 +120,8 @@ export default {
</script>
<style lang="less" scoped>
.pdf-detail {
margin: 0 20px 20px 20px;
// margin: 0 20px 20px 20px;
background: #fff;
.pdf-out {
text-align: right;
}
......
<template>
<div style="padding:40px 0">
<div style="padding:30px 0">
<Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
......
......@@ -4,10 +4,20 @@
background: #fff;
box-shadow: 0px 2px 6px rgba(0,0,0,0.16);
}
.table-detail{
padding: 20px 100px;
display: block;
width: 98%;
margin: 0 auto;
box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.16);
.ivu-row .filed-col > .label{
background: #267feb1e;
}
}
.Design{
margin:20px auto;
width: 98%;
padding: 20px;
padding: 20px 100px;
background: #fff;
box-shadow: 0px 2px 6px rgba(0,0,0,0.16);
.ivu-timeline-item-head{
......
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