Skip to content

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

view

parent efd4f629
Hide whitespace changes
Inline Side-by-side
Showing with 741 additions and 40 deletions
package-lock.json
View file @ a1267d53
......@@ -9538,7 +9538,8 @@
"dependencies": {
"deepmerge": {
"version": "2.2.1",
"bundled": true
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
}
}
},
......@@ -19890,7 +19891,8 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true
"dev": true,
"optional": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
......
pages/technology/edit.vue
View file @ a1267d53
......@@ -239,7 +239,6 @@ export default {
}
},
uid(v) {
alert(v);
}
}
};
......
pages/technology/index.vue
View file @ a1267d53
......@@ -65,8 +65,15 @@
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" :uid="uId" :title="title" @on-close="cancel" @on-ok="ok" />
<Modal v-model="modal" :title="title" width="1120" footer-hide>
<component
:is="detail"
:eid="curId"
:uid="uId"
:title="title"
@on-close="cancel"
@on-ok="ok"
/>
</Modal>
<div class="fullWindow flex fd" v-if="viewModal">
<div class="top flex">
......@@ -251,10 +258,18 @@ export default {
{
title: "操作",
key: "action",
width: 150,
width: 180,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.viewprocess(params.row) }
},
"预览"
),
h(
"op",
{
......@@ -263,7 +278,14 @@ export default {
},
"查看"
),
h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
h(
"op",
{
attrs: { oprate: "copy" },
on: { click: () => this.copy(params.row.id) }
},
"克隆"
),
h(
"op",
{
......@@ -290,7 +312,8 @@ export default {
routingType: 0, //工艺类型
version: "", //工艺版本
departmentId: null //车间
}
},
processviewModal: false
};
},
created() {
......@@ -366,12 +389,18 @@ export default {
// this.detail = () => import("./detail");
// this.modal = true;
// },
viewprocess(row) {
this.curId = row.id;
this.title = "预览";
this.detail = () => import("./processview");
this.modal = true;
},
edit(row) {
this.curId = row.id;
if (row.fileId) {
this.uId = row.fileId;
} else {
this.uId=this.$u.guid()//未上传过文件
this.uId = this.$u.guid(); //未上传过文件
}
this.title = "编辑";
......@@ -397,3 +426,25 @@ export default {
}
};
</script>
<style lang="less" scoped>
@import "./menu.less";
.order-quotation {
height: 100vh !important;
}
.table {
margin-top: 15px;
}
.topTitle {
height: 30px;
.table_title {
float: left;
width: 340px;
}
.title_btn {
margin-top: 1px;
}
}
.single-page-con {
overflow-y: hidden !important;
}
</style>
pages/technology/menu.less 0 → 100644
View file @ a1267d53
.model_new{
background: #fff;
.ivu-menu-item-selected{
font-size: 14px;
color: #249e91!important;
background: #fff!important;
}
.ivu-menu-item-selected:after{
background: #249e91!important;
}
.ivu-menu-item:hover{
color: #249e91;
}
}
// .tableCommon{
// // margin-bottom: 10px;
// }
.title_color{
color: #249e91;
}
// 创建主工艺弹窗
.one_model{
.ivu-modal-body {
padding: 4px 16px;
}
}
.inventory{
font-size: 14px;
.title_inventory{
text-align: center;
}
.bianhao{
height: 40px;
span{
float: right;
padding: 5px 5px 2px;
}
.border_b{
border-bottom: 1px solid #9e9e9e;
}
}
}
.top_part{
.select_order{
margin-top: -8px;
width: 240px;
}
.radio_slect{
height: 40px;
.ivu-radio-checked .ivu-radio-inner {
border-color: #249e91;
}
.ivu-radio-inner:after{
background: #249e91;
}
label.ivu-radio-wrapper.ivu-radio-group-item.ivu-radio-default {
border: 1px solid #ccc;
padding: 6px;
margin: 0 10px;
}
}
}
.table {
margin-top: 15px;
}
.new_box{
padding-left:20px;
padding-right:20px;
.topTitle{
height: 40px;
}
.icon_box{
span{
display: inline-block;
width: 30px;
height: 23px;
cursor: pointer;
}
.fujian_icon{
background: url(./image/u21462.png) no-repeat center;
}
.zhijian_icon{
background: url(./image/u21464.png) no-repeat center;
}
.zhizao_icon{
background: url(./image/u21466.png) no-repeat center;
}
.gongbu_icon{
background: url(./image/u21468.png) no-repeat center;
}
.edit_icon{
background: url(./image/u21472.png) no-repeat center;
}
.del_icon{
background: url(./image/u21470.png) no-repeat center;
}
}
}
.radio_option{
.ivu-radio-checked .ivu-radio-inner {
border-color: #249e91;
}
.ivu-radio-inner:after{
background: #249e91;
}
}
.inventory_box{
border-top: 1px solid #e8eaec;
margin: 0 0 20px;
h4{
border-left: 1px solid #e8eaec;
border-right: 1px solid #e8eaec;
text-align: center;
height: 40px;
font-size: 16px;
line-height: 40px;
}
}
.Product{
font-size: 14px;;
h2{
text-align: center;
}
.header_Product{
height: 40px;
.marggin{
float: left;
span{
display: inline-block;
// float: right;
// width: 105px;
height: 30px;
padding: 5px 5px 2px;
}
.border_b{
border-bottom: 1px solid #9e9e9e;
width: 160px;
}
}
.part02{
margin: 0 260px 0;
}
}
}
.change_title{
text-align: center;
height: 32px;
}
.change_box{
border-top: 1px solid #aaa;
border-right: 1px solid #aaa;
.change_row{
height: 40px;
border-bottom: 1px solid #aaa;
span{
border-left: 1px solid #aaa;
display: block;
width: 120px;
float: left;
height: 40px;
line-height: 40px;
font-size: 14px;
}
.change_label{
text-align: center;
}
.change_content{
width: calc(50% - 120px);
}
.Number{
width: 100px;
}
.data{
width: calc(50% - 340px);
}
.width_reset{
width: calc(100% / 3 - 120px);
}
}
.change_div{
border-bottom: 1px solid #aaa;
height: 240px;
.change_futu{
border-left: 1px solid #aaa;
width: 50%;
height: 240px;
font-size: 14px;
padding: 5px;
float: left;
}
}
.part01 .table_row{
height: 60px;
line-height: 60px;
}
.table_row02{
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height:62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
}
.iviewimg {
width: 100%;
height: 80px;
text-align: center;
margin: 0 0 40px;
img.imglogo {
display: inline-block;
height: 85px;
}
}
.iview_cont{
border-right: 1px solid #000;
width: 100%;
// height: 60px;
// line-height: 60px;
}
.iview_cont6{
height: 60px;
line-height: 60px;
}
.title_cont{
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01{
display: inline-block;
margin: 5px 6px;
font-weight: bold;
span{
display: inline;
}
.min120{
min-width: 120px;
}
}
.box{
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.h1{
font-size: 36px;
display:inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.table_row02{
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height:62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
.row03{
.tex_in10{
text-indent: 12px;
text-align: inherit!important;
}
}
.auto_row {
min-height: 60px!important;
height: auto!important;
padding: 5px;
}
.outP table thead tr th,.outP table tbody tr td{
padding: 2px 0;
// height: 30px;
line-height: 28px;
}
.outP table tbody tr td{
padding: 0 5px;
}
.tit01{ min-width: 70px; }
.tit02{ min-width: 100px; }
.tit03{ min-width: 300px; }
.tit04{ min-width: 100px; }
.tit05{ min-width: 100px; }
.title01{ min-width: 110px; }
.title02{ min-width: 300px; }
.title03{ min-width: 100px; }
.title04{ min-width: 100px; }
.title05{ min-width: 100px; }
.title06{ min-width: 100px; }
.outPdf table, .outPdf table tr th, .outPdf table tr td {
border-color: #000;
}
\ No newline at end of file
pages/technology/processview.vue
View file @ a1267d53
<template>
<div>
<div class="out">
<Row v-show="circleModal" style="height:300px">
<Col class="demo-spin-col" span="24">
<Spin fix style="margin-top:80px">
<Icon type="ios-loading" size="36" class="demo-spin-icon-load"></Icon>
<div>APS排产进行中......</div>
</Spin>
</Col>
</Row>
<div class="out" v-show="!circleModal">
<Row class="table_row" style="width:100%">
<Button class="fr" v-if="isoutpdf" type="primary" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
</Row>
</div>
<div class="outP">
<div class="outP" v-show="!circleModal">
<div class="table_box part01" style="min-height:400px">
<Row class="table_row" style="width:100%">
<Col span="3">
......@@ -14,17 +22,16 @@
</Col>
<Col span="9">
<div class="iview_cont">
&nbsp;
<label v-text="formValidate.code"></label>
</div>
</Col>
<Col span="5">
<div class="row_label box"></div>
</Col>
<Col span="3">
<div class="row_label">任务类型</div>
</Col>
<Col span="4">
<Col span="9">
<div class="iview_cont border_none">
&nbsp;
<label v-text="formValidate.task_type_str"></label>
</div>
</Col>
......@@ -35,17 +42,16 @@
</Col>
<Col span="9">
<div class="iview_cont">
&nbsp;
<label v-text="formValidate.versiondesc"></label>
</div>
</Col>
<Col span="5">
<div class="row_label box"></div>
</Col>
<Col span="3">
<div class="row_label">研制方式</div>
</Col>
<Col span="4">
<Col span="9">
<div class="iview_cont border_none">
&nbsp;
<label v-text="formValidate.development_mode_str"></label>
</div>
</Col>
......@@ -207,45 +213,90 @@
</div>
</template>
<script>
import service from '@/plugins/request'
import service from "@/plugins/request";
export default {
name: 'processview',
name: "processview",
data() {
return {
filesurl: '',
filesurl: "",
downUrl: fileUrlDown,
formValidate: {
files: [],
details: [],
qcards: []
}
}
},
circleModal: true
};
},
props: {
//设置工艺、创建工艺
isoutpdf: {
type: Boolean,
default: true
},
eid: Number
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
loaddata(headerID) {
var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID
service.get(`${url}`).then((response) => {
this.formValidate = response.result
load(v) {
this.circleModal = true;
var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + v;
service
.get(`${url}`)
.then(response => {
this.circleModal = false;
this.formValidate = response.result;
if (
this.formValidate.change_order_code == "" ||
typeof this.formValidate.change_order_code == "undefined"
) {
this.formValidate.change_order_date = "";
}
if (typeof this.formValidate.production_batch == "undefined") {
this.formValidate.production_batch = "&nbsp";
}
if (this.formValidate.change_order_code == ''||typeof this.formValidate.change_order_code == 'undefined') {
this.formValidate.change_order_date = ''
}
if (typeof this.formValidate.production_batch == 'undefined') {
this.formValidate.production_batch = '&nbsp'
}
if (typeof this.formValidate.print_data_name == 'undefined') {
this.formValidate.print_data_name = '&nbsp'
}
})
if (typeof this.formValidate.print_data_name == "undefined") {
this.formValidate.print_data_name = "&nbsp";
}
})
.catch(err => {
this.circleModal = false;
});
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
}
}
};
</script>
<style type="less" scoped>
.demo-spin-icon-load {
animation: ani-demo-spin 1s linear infinite;
}
@keyframes ani-demo-spin {
from {
transform: rotate(0deg);
}
50% {
transform: rotate(180deg);
}
to {
transform: rotate(360deg);
}
}
.demo-spin-col {
height: 100px;
position: relative;
border: 0px solid #eee;
}
</style>
src/assets/css/menu.css 0 → 100644
View file @ a1267d53
.model_new {
background: #fff;
}
.model_new .ivu-menu-item-selected {
font-size: 14px;
color: #249e91 !important;
background: #fff !important;
}
.model_new .ivu-menu-item-selected:after {
background: #249e91 !important;
}
.model_new .ivu-menu-item:hover {
color: #249e91;
}
.title_color {
color: #249e91;
}
.one_model .ivu-modal-body {
padding: 4px 16px;
}
.inventory {
font-size: 14px;
}
.inventory .title_inventory {
text-align: center;
}
.inventory .bianhao {
height: 40px;
}
.inventory .bianhao span {
float: right;
padding: 5px 5px 2px;
}
.inventory .bianhao .border_b {
border-bottom: 1px solid #9e9e9e;
}
.top_part .select_order {
margin-top: -8px;
width: 240px;
}
.top_part .radio_slect {
height: 40px;
}
.top_part .radio_slect .ivu-radio-checked .ivu-radio-inner {
border-color: #249e91;
}
.top_part .radio_slect .ivu-radio-inner:after {
background: #249e91;
}
.top_part .radio_slect label.ivu-radio-wrapper.ivu-radio-group-item.ivu-radio-default {
border: 1px solid #ccc;
padding: 6px;
margin: 0 10px;
}
.table {
margin-top: 15px;
}
.new_box {
padding-left: 20px;
padding-right: 20px;
}
.new_box .topTitle {
height: 40px;
}
.new_box .icon_box span {
display: inline-block;
width: 30px;
height: 23px;
cursor: pointer;
}
.new_box .icon_box .fujian_icon {
background: url(image/u21462.png) no-repeat center;
}
.new_box .icon_box .zhijian_icon {
background: url(image/u21464.png) no-repeat center;
}
.new_box .icon_box .zhizao_icon {
background: url(image/u21466.png) no-repeat center;
}
.new_box .icon_box .gongbu_icon {
background: url(image/u21468.png) no-repeat center;
}
.new_box .icon_box .edit_icon {
background: url(image/u21472.png) no-repeat center;
}
.new_box .icon_box .del_icon {
background: url(image/u21470.png) no-repeat center;
}
.radio_option .ivu-radio-checked .ivu-radio-inner {
border-color: #249e91;
}
.radio_option .ivu-radio-inner:after {
background: #249e91;
}
.inventory_box {
border-top: 1px solid #e8eaec;
margin: 0 0 20px;
}
.inventory_box h4 {
border-left: 1px solid #e8eaec;
border-right: 1px solid #e8eaec;
text-align: center;
height: 40px;
font-size: 16px;
line-height: 40px;
}
.Product {
font-size: 14px;
}
.Product h2 {
text-align: center;
}
.Product .header_Product {
height: 40px;
}
.Product .header_Product .marggin {
float: left;
}
.Product .header_Product .marggin span {
display: inline-block;
height: 30px;
padding: 5px 5px 2px;
}
.Product .header_Product .marggin .border_b {
border-bottom: 1px solid #9e9e9e;
width: 160px;
}
.Product .header_Product .part02 {
margin: 0 260px 0;
}
.change_title {
text-align: center;
height: 32px;
}
.change_box {
border-top: 1px solid #aaa;
border-right: 1px solid #aaa;
}
.change_box .change_row {
height: 40px;
border-bottom: 1px solid #aaa;
}
.change_box .change_row span {
border-left: 1px solid #aaa;
display: block;
width: 120px;
float: left;
height: 40px;
line-height: 40px;
font-size: 14px;
}
.change_box .change_row .change_label {
text-align: center;
}
.change_box .change_row .change_content {
width: calc(50% - 120px);
}
.change_box .change_row .Number {
width: 100px;
}
.change_box .change_row .data {
width: calc(50% - 340px);
}
.change_box .change_row .width_reset {
width: calc(100% / 3 - 120px);
}
.change_box .change_div {
border-bottom: 1px solid #aaa;
height: 240px;
}
.change_box .change_div .change_futu {
border-left: 1px solid #aaa;
width: 50%;
height: 240px;
font-size: 14px;
padding: 5px;
float: left;
}
.change_box .part01 .table_row {
height: 60px;
line-height: 60px;
}
.change_box .table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
.iviewimg {
width: 100%;
height: 80px;
text-align: center;
margin: 0 0 40px;
}
.iviewimg img.imglogo {
display: inline-block;
height: 85px;
}
.iview_cont {
border-right: 1px solid #000;
width: 100%;
}
.iview_cont6 {
height: 60px;
line-height: 60px;
}
.title_cont {
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display: inline-block;
margin: 5px 6px;
font-weight: bold;
}
.iview_cont01 span {
display: inline;
}
.iview_cont01 .min120 {
min-width: 120px;
}
.box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.h1 {
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
.row03 .tex_in10 {
text-indent: 12px;
text-align: inherit!important;
}
.auto_row {
min-height: 60px!important;
height: auto!important;
padding: 5px;
}
.outP table thead tr th,
.outP table tbody tr td {
padding: 2px 0;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
}
.tit01 {
min-width: 70px;
}
.tit02 {
min-width: 100px;
}
.tit03 {
min-width: 300px;
}
.tit04 {
min-width: 100px;
}
.tit05 {
min-width: 100px;
}
.title01 {
min-width: 110px;
}
.title02 {
min-width: 300px;
}
.title03 {
min-width: 100px;
}
.title04 {
min-width: 100px;
}
.title05 {
min-width: 100px;
}
.title06 {
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
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