Skip to content

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

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

parents acbd6b19 23e0cd65
Hide whitespace changes
Inline Side-by-side
Showing with 1328 additions and 1006 deletions
components/orderOperator/orderInfos.vue
View file @ 31927bd1
...@@ -87,27 +87,4 @@ export default { ...@@ -87,27 +87,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
components/page/filed.vue
View file @ 31927bd1
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
display: table; display: table;
height: 100%; height: 100%;
border-collapse: collapse; border-collapse: collapse;
background: white;
.ivu-row { .ivu-row {
border: 1px solid #ddd; border: 1px solid #ddd;
border-top: none; border-top: none;
...@@ -34,24 +35,22 @@ export default { ...@@ -34,24 +35,22 @@ export default {
border-right: none; border-right: none;
margin: 0 -1px -1px -1px; margin: 0 -1px -1px -1px;
box-sizing: border-box; box-sizing: border-box;
line-height: 70px; display: flex;
flex-direction: row;
line-height: 40px;
.label { .label {
background: #e8eaf1; background: #f7f7f7;
display: inline-block; display: inline-block;
width: 100px; width: 110px;
text-align: right; text-align: right;
padding: 0 5px; padding: 0 10px 0 0;
line-height: 40px; border-right: 1px solid #ddd;
float: left;
height: 100%;
} }
p { p {
height: 100%;
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
margin: 0 10px 0 110px; flex-grow: 1;
line-height: 20px; padding-left: 10px;
padding-top: 10px;
} }
} }
.ivu-col-span-24 { .ivu-col-span-24 {
...@@ -65,22 +64,21 @@ export default { ...@@ -65,22 +64,21 @@ export default {
} }
} }
} }
.new-detail { .new_detail {
.ivu-row { .ivu-row {
width: 100% !important; width: 100% !important;
.filed-col { .filed-col {
box-sizing: border-box; box-sizing: border-box;
line-height: 70px; line-height: 70px;
.label { >.label {
display: inline-block; display: inline-block;
width: 100px; width: 100px;
text-align: right; text-align: right;
line-height: 40px; line-height: 40px;
float: left;
height: 100%; height: 100%;
font-weight: bold; font-weight: bold;
} }
p { >p {
text-align: left; text-align: left;
height: 100%; height: 100%;
word-break: break-all; word-break: break-all;
......
package-lock.json
View file @ 31927bd1
...@@ -5611,9 +5611,9 @@ ...@@ -5611,9 +5611,9 @@
"dev": true "dev": true
}, },
"dayjs": { "dayjs": {
"version": "1.8.25", "version": "1.8.26",
"resolved": "http://r.cnpmjs.org/dayjs/download/dayjs-1.8.25.tgz", "resolved": "http://r.cnpmjs.org/dayjs/download/dayjs-1.8.26.tgz",
"integrity": "sha1-0JqGls7nGRvBKJ5zn5ZiY5G5xzw=" "integrity": "sha1-xtYszfBYynKo0Uu5OiNQEFjbnx4="
}, },
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
...@@ -7665,8 +7665,7 @@ ...@@ -7665,8 +7665,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -7684,13 +7683,11 @@ ...@@ -7684,13 +7683,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -7703,18 +7700,15 @@ ...@@ -7703,18 +7700,15 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -7817,8 +7811,7 @@ ...@@ -7817,8 +7811,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -7828,7 +7821,6 @@ ...@@ -7828,7 +7821,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -7841,20 +7833,17 @@ ...@@ -7841,20 +7833,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -7871,7 +7860,6 @@ ...@@ -7871,7 +7860,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.3", "version": "0.5.3",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
...@@ -7927,8 +7915,7 @@ ...@@ -7927,8 +7915,7 @@
}, },
"npm-normalize-package-bin": { "npm-normalize-package-bin": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"npm-packlist": { "npm-packlist": {
"version": "1.4.8", "version": "1.4.8",
...@@ -7953,8 +7940,7 @@ ...@@ -7953,8 +7940,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -7964,7 +7950,6 @@ ...@@ -7964,7 +7950,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -8033,8 +8018,7 @@ ...@@ -8033,8 +8018,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -8064,7 +8048,6 @@ ...@@ -8064,7 +8048,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -8082,7 +8065,6 @@ ...@@ -8082,7 +8065,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -8121,13 +8103,11 @@ ...@@ -8121,13 +8103,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
...@@ -8143,6 +8123,26 @@ ...@@ -8143,6 +8123,26 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"gantt-elastic": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/gantt-elastic/-/gantt-elastic-1.0.11.tgz",
"integrity": "sha512-Im0hemDdfshSl/ZaAYBSl3WEk+W9U7vQbEasWbUk9uk40q4onXxWim9/N3m/izNwo4A2boikkmSo9oTjz5ff0w==",
"requires": {
"dayjs": "^1.8.16",
"resize-observer-polyfill": "^1.5.1",
"vue": "^2.6.10"
}
},
"gantt-elastic-header": {
"version": "0.1.11",
"resolved": "http://r.cnpmjs.org/gantt-elastic-header/download/gantt-elastic-header-0.1.11.tgz",
"integrity": "sha1-i5/sjlFwm4L/WaA4bwZoUK5pxtE=",
"requires": {
"vue": "^2.6.10",
"vue-slider-component": "^3.0.31",
"vue-switches": "^2.0.1"
}
},
"gensync": { "gensync": {
"version": "1.0.0-beta.1", "version": "1.0.0-beta.1",
"resolved": "http://r.cnpmjs.org/gensync/download/gensync-1.0.0-beta.1.tgz", "resolved": "http://r.cnpmjs.org/gensync/download/gensync-1.0.0-beta.1.tgz",
...@@ -19769,6 +19769,11 @@ ...@@ -19769,6 +19769,11 @@
"resolved": "http://r.cnpmjs.org/resize-detector/download/resize-detector-0.1.10.tgz", "resolved": "http://r.cnpmjs.org/resize-detector/download/resize-detector-0.1.10.tgz",
"integrity": "sha1-HaP5YapfkUzLz9N1LVL9Rb7raSw=" "integrity": "sha1-HaP5YapfkUzLz9N1LVL9Rb7raSw="
}, },
"resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
},
"resolve": { "resolve": {
"version": "1.17.0", "version": "1.17.0",
"resolved": "http://r.cnpmjs.org/resolve/download/resolve-1.17.0.tgz", "resolved": "http://r.cnpmjs.org/resolve/download/resolve-1.17.0.tgz",
...@@ -22147,6 +22152,11 @@ ...@@ -22147,6 +22152,11 @@
"resolved": "http://r.cnpmjs.org/vue/download/vue-2.6.11.tgz", "resolved": "http://r.cnpmjs.org/vue/download/vue-2.6.11.tgz",
"integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU=" "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU="
}, },
"vue-class-component": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.3.tgz",
"integrity": "sha512-oEqYpXKaFN+TaXU+mRLEx8dX0ah85aAJEe61mpdoUrq0Bhe/6sWhyZX1JjMQLhVsHAkncyhedhmCdDVSasUtDw=="
},
"vue-client-only": { "vue-client-only": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "http://r.cnpmjs.org/vue-client-only/download/vue-client-only-2.0.0.tgz", "resolved": "http://r.cnpmjs.org/vue-client-only/download/vue-client-only-2.0.0.tgz",
...@@ -22278,6 +22288,14 @@ ...@@ -22278,6 +22288,14 @@
"resolved": "http://r.cnpmjs.org/vue-no-ssr/download/vue-no-ssr-1.1.1.tgz", "resolved": "http://r.cnpmjs.org/vue-no-ssr/download/vue-no-ssr-1.1.1.tgz",
"integrity": "sha1-h1875vsK5BVoqDfzrBqA6qE3uZg=" "integrity": "sha1-h1875vsK5BVoqDfzrBqA6qE3uZg="
}, },
"vue-property-decorator": {
"version": "8.4.2",
"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.4.2.tgz",
"integrity": "sha512-IqbARlvgPE2pzKfbecKxsu2yEH0Wv7hfHR6m4eZA3LTnNw9hveAX77vDfLFyTeMISS5N7Kucp/xRSHjcQ6bAfQ==",
"requires": {
"vue-class-component": "^7.1.0"
}
},
"vue-quill-editor": { "vue-quill-editor": {
"version": "3.0.6", "version": "3.0.6",
"resolved": "http://r.cnpmjs.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz", "resolved": "http://r.cnpmjs.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",
...@@ -22359,6 +22377,14 @@ ...@@ -22359,6 +22377,14 @@
} }
} }
}, },
"vue-slider-component": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/vue-slider-component/-/vue-slider-component-3.1.3.tgz",
"integrity": "sha512-SPFb1I3G2a4thIwghvVNhcvPGCUz6PIZR1ClwtvN4MT44ZUzvqCMDS7osdKz0hdKu4kfanxET8qZn826A/XPxA==",
"requires": {
"vue-property-decorator": "^8.0.0"
}
},
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "http://r.cnpmjs.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz", "resolved": "http://r.cnpmjs.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz",
...@@ -22375,6 +22401,14 @@ ...@@ -22375,6 +22401,14 @@
} }
} }
}, },
"vue-switches": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/vue-switches/-/vue-switches-2.0.1.tgz",
"integrity": "sha512-rDqBtK3TKy1pEvyZeWmnSHVeXqAcn+ozch7LiNThBzr1QMjg5rhvqBY7uWeli/baDDslf6CXmBJbHPwASJLqoA==",
"requires": {
"vue": "^2.2.6"
}
},
"vue-template-compiler": { "vue-template-compiler": {
"version": "2.6.11", "version": "2.6.11",
"resolved": "http://r.cnpmjs.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz", "resolved": "http://r.cnpmjs.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz",
......
package.json
View file @ 31927bd1
...@@ -18,9 +18,11 @@ ...@@ -18,9 +18,11 @@
"awe-dnd": "^0.3.4", "awe-dnd": "^0.3.4",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"dayjs": "^1.8.22", "dayjs": "^1.8.26",
"echarts": "^4.7.0", "echarts": "^4.7.0",
"echarts-liquidfill": "^2.0.5", "echarts-liquidfill": "^2.0.5",
"gantt-elastic": "^1.0.11",
"gantt-elastic-header": "^0.1.11",
"gojs": "^2.1.10", "gojs": "^2.1.10",
"iview-loader": "^1.3.0", "iview-loader": "^1.3.0",
"iview-pro": "file:./iview-pro", "iview-pro": "file:./iview-pro",
...@@ -45,6 +47,8 @@ ...@@ -45,6 +47,8 @@
"vue-i18n": "^8.15.5", "vue-i18n": "^8.15.5",
"vue-json-viewer": "^2.2.8", "vue-json-viewer": "^2.2.8",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-slider-component": "^3.1.3",
"vue-switches": "^2.0.1",
"vue-ueditor-wrap": "^2.4.1", "vue-ueditor-wrap": "^2.4.1",
"vue2-editor": "^2.10.2", "vue2-editor": "^2.10.2",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
......
pages/handle/examine1/detail.vue
View file @ 31927bd1
...@@ -77,27 +77,4 @@ export default { ...@@ -77,27 +77,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine10/detail.vue
View file @ 31927bd1
...@@ -103,27 +103,4 @@ export default { ...@@ -103,27 +103,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine11/detail.vue
View file @ 31927bd1
...@@ -103,27 +103,4 @@ export default { ...@@ -103,27 +103,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine12/detail.vue
View file @ 31927bd1
...@@ -104,27 +104,4 @@ export default { ...@@ -104,27 +104,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine2/detail.vue
View file @ 31927bd1
...@@ -80,27 +80,4 @@ export default { ...@@ -80,27 +80,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine4/detail.vue
View file @ 31927bd1
...@@ -79,27 +79,4 @@ export default { ...@@ -79,27 +79,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine6/detail.vue
View file @ 31927bd1
<template> <template>
<div class="detail"style="width:90%;margin:0 auto" > <div class="detail"style="width:90%;margin:0 auto" >
<Row> <Row>
<Filed :span="120" :name="'工艺更改单'">{{results.changeorder_code}}</Filed> <Filed :span="12" :name="'工艺更改单'">{{results.changeorder_code}}</Filed>
<Filed :span="120" :name="'提出人'">{{results.propose_user_name}}</Filed> <Filed :span="12" :name="'提出人'">{{results.propose_user_name}}</Filed>
<Filed :span="120" :name="'申请部门'">{{results.department_name}}</Filed> <Filed :span="12" :name="'申请部门'">{{results.department_name}}</Filed>
<Filed :span="120" :name="'技术文件名称'">{{results.technical_name}}</Filed> <Filed :span="12" :name="'技术文件名称'">{{results.technical_name}}</Filed>
</Row> <Filed :span="12" :name="'数量'">{{results.quantity}}</Filed>
<Row> <Filed :span="12" :name="'发行日期'">{{results.print_data}}</Filed>
<Filed :span="120" :name="'数量'">{{results.quantity}}</Filed> <Filed :span="12" :name="'更改原因'">{{results.change_reason}}</Filed>
<Filed :span="120" :name="'发行日期'">{{results.print_data}}</Filed> <Filed :span="12" :name="'技术文件编号'">{{results.technical_code}}</Filed>
<Filed :span="120" :name="'更改原因'">{{results.change_reason}}</Filed>
<Filed :span="120" :name="'技术文件编号'">{{results.technical_code}}</Filed> <Filed :span="12" :name="'有效日期'">{{results.effective_date}}</Filed>
</Row> <Filed :span="12" :name="'执行部门'">{{results.executive_branch}}</Filed>
<Row> <Filed :span="12" :name="'更改后版本号'"><state code="Process.Routing.version" :value="results.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'有效日期'">{{results.effective_date}}</Filed> <Filed :span="12" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="results.handling_opinions+''" type="text"></state></Filed>
<Filed :span="120" :name="'执行部门'">{{results.executive_branch}}</Filed>
<Filed :span="120" :name="'更改后版本号'"><state code="Process.Routing.version" :value="results.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="results.handling_opinions+''" type="text"></state></Filed>
</Row> </Row>
<!-- <Row> <!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed> <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed> <Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> --> </Row> -->
</div> </div>
...@@ -118,27 +115,4 @@ export default { ...@@ -118,27 +115,4 @@ export default {
} }
} }
} }
</style> </style>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine7/detail.vue
View file @ 31927bd1
...@@ -64,27 +64,4 @@ export default { ...@@ -64,27 +64,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine8/detail.vue
View file @ 31927bd1
<template> <template>
<div class="detail" style="width:90%;margin:0 auto" > <div class="detail" style="width:90%;margin:0 auto">
<Row> <Row>
<Filed :span="120" :name="'生产协调单'">{{results.technical_coordination_code}}</Filed> <Filed :span="12" :name="'生产协调单'">{{results.technical_coordination_code}}</Filed>
<Filed :span="120" :name="'任务号'">{{results.taskCode}}</Filed> <Filed :span="12" :name="'任务号'">{{results.taskCode}}</Filed>
<Filed :span="120" :name="'数量'">{{results.quantity}}</Filed> <Filed :span="12" :name="'数量'">{{results.quantity}}</Filed>
<Filed :span="120" :name="'阶段'">{{results.phase}}</Filed> <Filed :span="12" :name="'阶段'">{{results.phase}}</Filed>
</Row> <Filed :span="12" :name="'产品名称'">{{results.product_name}}</Filed>
<Row> <Filed :span="12" :name="'产品标识'">{{results.product_mark}}</Filed>
<Filed :span="120" :name="'产品名称'">{{results.product_name}}</Filed> <Filed :span="12" :name="'协调内容'">{{results.coordinate_content}}</Filed>
<Filed :span="120" :name="'产品标识'">{{results.product_mark}}</Filed> <Filed :span="12" :name="'图号'">{{results.drawing}}</Filed>
<Filed :span="120" :name="'协调内容'">{{results.coordinate_content}}</Filed> <!-- <Filed :span="12" :name="'协调结果'">{{results.coordinate_results}}</Filed>
<Filed :span="120" :name="'图号'">{{results.drawing}}</Filed> <Filed :span="12" :name="'在制品意见'">{{results.handling_suggestion}}</Filed>-->
<!-- <Filed :span="120" :name="'协调结果'">{{results.coordinate_results}}</Filed>
<Filed :span="120" :name="'在制品意见'">{{results.handling_suggestion}}</Filed> --> <!-- <Filed :span="12" :name="'更改设计文件'">{{results.change_design_file}}</Filed>
<Filed :span="12" :name="'更改工艺文件'">{{results.change_process_file}}</Filed>
<Filed :span="12" :name="'编写临时工艺'">{{results.compilation_temporary_process}}</Filed>-->
<Filed :span="12" :name="'检验员'">{{results.inspection_person_name}}</Filed>
<Filed :span="12" :name="'检验时间'">{{results.inspection_date}}</Filed>
<!--
<Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12" :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>-->
</Row> </Row>
<Row>
<!-- <Filed :span="120" :name="'更改设计文件'">{{results.change_design_file}}</Filed>
<Filed :span="120" :name="'更改工艺文件'">{{results.change_process_file}}</Filed>
<Filed :span="120" :name="'编写临时工艺'">{{results.compilation_temporary_process}}</Filed> -->
<Filed :span="120" :name="'检验员'">{{results.inspection_person_name}}</Filed>
<Filed :span="120" :name="'检验时间'">{{results.inspection_date}}</Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
name: 'detail', name: "detail",
components: {}, components: {},
props: { props: {
idVal: { idVal: {
type: String, type: String,
default: '' default: ""
} }
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data() { data() {
return { return {
results: { results: {
state: '' state: ""
} }
} };
}, },
created() { created() {
this.dataImmut = [] this.dataImmut = [];
this.dataMut = [] this.dataMut = [];
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then(r => {
if (r.success) { if (r.success) {
this.results = JSON.parse(r.result.formData) this.results = JSON.parse(r.result.formData);
// let formStr = r.result.formData.replace(/\"/g, '"') // let formStr = r.result.formData.replace(/\"/g, '"')
// this.results = JSON.parse(formStr)[0] // this.results = JSON.parse(formStr)[0]
} else { } else {
this.$Message.error('加载失败') this.$Message.error("加载失败");
} }
}) });
}, },
methods: { methods: {
load(v) {}, load(v) {},
l(key) { l(key) {
key = 'waitOpened' + '.' + key key = "waitOpened" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: {} watch: {}
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdf-detail { .pdf-detail {
...@@ -119,27 +116,4 @@ export default { ...@@ -119,27 +116,4 @@ export default {
} }
} }
} }
</style> </style>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/process.vue
View file @ 31927bd1
<template> <template>
<div class="Design" style="width:80%;margin:50px auto;"> <div class="Design">
<h3>{{ processTitle }}</h3> <h3>{{ processTitle }}</h3>
<Divider /> <Divider />
<Timeline> <Timeline>
...@@ -192,3 +192,11 @@ export default { ...@@ -192,3 +192,11 @@ export default {
watch: {} watch: {}
} }
</script> </script>
<style lang="less">
.Design{
margin:20px auto; width:90%;
.ivu-timeline-item-head{
background-color: transparent;
}
}
</style>
\ No newline at end of file
pages/order/monitoring/speed.vue
View file @ 31927bd1
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
"op", "op",
{ {
props: { oprate: "edit", title: "分卡" }, props: { oprate: "edit", title: "分卡" },
// style: params.row.status == 5 ? "" : "display:none", style: params.row.status == 5 ? "" : "display:none",
on: { click: () => this.split(params.row) } on: { click: () => this.split(params.row) }
}, },
"分卡" "分卡"
......
pages/processDesign/ChangeSingle/components/orderInfos.vue
View file @ 31927bd1
...@@ -53,27 +53,4 @@ export default { ...@@ -53,27 +53,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/processDesign/ChangeSingle/technicalcoordination/techInfos.vue
View file @ 31927bd1
<template> <template>
<div class="detail" > <div class="detail" >
<Row> <Row>
<Filed :span="120" :name="'生产协调单'">{{info.changeInfo.technical_coordination_code}}</Filed> <Filed :span="12" :name="'生产协调单'">{{info.changeInfo.technical_coordination_code}}</Filed>
<Filed :span="120" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed> <Filed :span="12" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed>
<Filed :span="120" :name="'数量'">{{info.changeInfo.quantity}}</Filed> <Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed :span="120" :name="'阶段'">{{info.changeInfo.phase}}</Filed> <Filed :span="12" :name="'阶段'">{{info.changeInfo.phase}}</Filed>
</Row> </Row>
<Row> <Row>
<Filed :span="120" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed> <Filed :span="12" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed>
<Filed :span="120" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed> <Filed :span="12" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed>
<Filed :span="120" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed> <Filed :span="12" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed>
<Filed :span="120" :name="'图号'">{{info.changeInfo.drawing}}</Filed> <Filed :span="12" :name="'图号'">{{info.changeInfo.drawing}}</Filed>
<!-- <Filed :span="120" :name="'协调结果'">{{info.changeInfo.coordinate_results}}</Filed> <!-- <Filed :span="12" :name="'协调结果'">{{info.changeInfo.coordinate_results}}</Filed>
<Filed :span="120" :name="'在制品意见'">{{info.changeInfo.handling_suggestion}}</Filed> --> <Filed :span="12" :name="'在制品意见'">{{info.changeInfo.handling_suggestion}}</Filed> -->
<!-- <Filed :span="12" :name="'更改设计文件'">{{info.changeInfo.change_design_file}}</Filed>
<Filed :span="12" :name="'更改工艺文件'">{{info.changeInfo.change_process_file}}</Filed>
<Filed :span="12" :name="'编写临时工艺'">{{info.changeInfo.compilation_temporary_process}}</Filed> -->
<Filed :span="12" :name="'检验员'">{{info.changeInfo.inspection_person_name}}</Filed>
<Filed :span="12" :name="'检验时间'">{{info.changeInfo.inspection_date}}</Filed>
<!-- <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed> -->
</Row> </Row>
<Row>
<!-- <Filed :span="120" :name="'更改设计文件'">{{info.changeInfo.change_design_file}}</Filed>
<Filed :span="120" :name="'更改工艺文件'">{{info.changeInfo.change_process_file}}</Filed>
<Filed :span="120" :name="'编写临时工艺'">{{info.changeInfo.compilation_temporary_process}}</Filed> -->
<Filed :span="120" :name="'检验员'">{{info.changeInfo.inspection_person_name}}</Filed>
<Filed :span="120" :name="'检验时间'">{{info.changeInfo.inspection_date}}</Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
...@@ -57,27 +55,4 @@ export default { ...@@ -57,27 +55,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/processDesign/Process/changeInfos.vue
View file @ 31927bd1
<template> <template>
<div class="detail" > <div class="detail">
<Row> <Row>
<Filed :span="120" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed> <Filed :span="12" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed>
<Filed :span="120" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed> <Filed :span="12" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed>
<Filed :span="120" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed> <Filed :span="12" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed>
<Filed :span="120" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed> <Filed :span="12" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed>
<Filed :span="120" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed> <Filed :span="12" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed>
</Row>
<Row> <Filed :span="12" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed>
<Filed :span="120" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed> <Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed :span="120" :name="'数量'">{{info.changeInfo.quantity}}</Filed> <Filed :span="12" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed>
<Filed :span="120" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed> <Filed :span="12" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed>
<Filed :span="120" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed> <Filed :span="12" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
<Filed :span="120" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
<Filed :span="12" :name="'更改后版本号'">
<state
code="Process.Routing.version"
:value="info.changeInfo.changed_version+''"
type="text"
></state>
</Filed>
<Filed :span="12" :name="'在制品意见'">
<state
code="Process.Routing.opinion"
:value="info.changeInfo.handling_opinions+''"
type="text"
></state>
</Filed>
<!-- <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>-->
</Row> </Row>
<Row>
<Filed :span="120" :name="'更改后版本号'"><state code="Process.Routing.version" :value="info.changeInfo.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="info.changeInfo.handling_opinions+''" type="text"></state></Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'changeInfos', name: "changeInfos",
props: ['info'], props: ["info"],
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data(){ data() {
return{ return {};
}
}, },
methods: { methods: {
arry2Name(arryList, values) { arry2Name(arryList, values) {
//预警类别转换 //预警类别转换
var codes = arryList var codes = arryList;
var name = '' var name = "";
for (let i in codes) { for (let i in codes) {
if (values == codes[i].value) { if (values == codes[i].value) {
name = codes[i].name name = codes[i].name;
} }
} }
return name return name;
}, },
l(key) { l(key) {
key = 'orderInfo' + '.' + key key = "orderInfo" + "." + key;
return this.$t(key) return this.$t(key);
}
}
}
</script>
<style lang="less">
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
} }
} }
} };
</style> </script>
\ No newline at end of file \ No newline at end of file
pages/processDesign/setProcess/components/dataDissemination.vue
View file @ 31927bd1
...@@ -161,27 +161,4 @@ export default { ...@@ -161,27 +161,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/processDesign/setProcess/components/orderInfos.vue
View file @ 31927bd1
...@@ -58,27 +58,4 @@ export default { ...@@ -58,27 +58,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/processManage/setProcess/components/dataDissemination.vue
View file @ 31927bd1
...@@ -161,27 +161,4 @@ export default { ...@@ -161,27 +161,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/processManage/setProcess/components/orderInfos.vue
View file @ 31927bd1
...@@ -58,27 +58,4 @@ export default { ...@@ -58,27 +58,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/produce/execute/MaterialCollec/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
物料领用</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCase/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
工艺案例</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
工艺查看</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/components/functional.vue
View file @ 31927bd1
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
<template> <template>
<div class="addd"> <div class="addd">
<ul> <ul>
<li><a @click="gnFunto(0,0)" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li> <li><a @click="gnFunto(0,'进度汇报')" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li>
<li><a @click="gnFunto(1,1)" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li> <li><a @click="gnFunto(1,'物料领用')" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li>
<li><a @click="gnFunto(2,2)" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li> <li><a @click="gnFunto(2,'产品装配')" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li>
<li><a @click="gnFunto(3,3)" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li> <li><a @click="gnFunto(3,'工时分配')" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li>
<li><a @click="gnFunto(4,4)" :class="{active:gnFlag == 4}"><Icon type="ios-checkmark-circle" /> 生产准备</a></li> <li><a @click="gnFunto(4,'生产准备')" :class="{active:gnFlag == 4}"><Icon type="ios-checkmark-circle" /> 生产准备</a></li>
<li><a @click="gnFunto(5,5)" :class="{active:gnFlag == 5}"><Icon type="ios-eye" /> 工艺查看</a></li> <li><a @click="gnFunto(5,'工艺查看')" :class="{active:gnFlag == 5}"><Icon type="ios-eye" /> 工艺查看</a></li>
<li><a @click="gnFunto(6,6)" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li> <li><a @click="gnFunto(6,'工艺案例')" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li>
<li><a @click="gnFunto(7,7)" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li> <li><a @click="gnFunto(7,'质量判定')" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li>
<li><a @click="gnFunto(8,8)" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li> <li><a @click="gnFunto(8,'数据填报')" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li>
<li><a @click="gnFunto(9,9)" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li> <li><a @click="gnFunto(9,'测试数据')" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li>
</ul> </ul>
</div> </div>
</template> </template>
...@@ -27,7 +27,8 @@ export default { ...@@ -27,7 +27,8 @@ export default {
}, },
methods: { methods: {
gnFunto(number,type){ gnFunto(number,type){
this.gnFlag = number this.gnFlag = number;
this.$emit('changeTitle',number,type);
} }
}, },
} }
......
pages/produce/execute/datafilling/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
数据填报</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/execute.less
View file @ 31927bd1
...@@ -100,15 +100,6 @@ ...@@ -100,15 +100,6 @@
.ivu-drawer-body { .ivu-drawer-body {
padding: 0; padding: 0;
height: calc(100% - 210px); height: calc(100% - 210px);
// .order_title {
// border-bottom: 1px solid #ccc;
// height: 50px;
// line-height: 50px;
// padding: 0 0 0 15px;
// .gd_tt{
// margin: 0 55px 0 0;
// }
// }
.order_list{ .order_list{
.select_t { .select_t {
padding: 15px 20px; padding: 15px 20px;
...@@ -179,4 +170,14 @@ ...@@ -179,4 +170,14 @@
background: #2680EB; background: #2680EB;
} }
} }
}
.gs_set{
height: 100vh;
.gs_top{
margin: 0 auto;
width: 1000px;
height: 120px;
background: #2680EB;
color: #fff;
}
} }
\ No newline at end of file
pages/produce/execute/index.vue
View file @ 31927bd1
...@@ -4,52 +4,21 @@ ...@@ -4,52 +4,21 @@
<template> <template>
<div class="execute_box"> <div class="execute_box">
<div class="top_title"> <div class="top_title">
<span class="fl">进度汇报</span> <span class="fl">{{orderTitle}}--{{orderindex}}</span>
<div>工单编号: 12001011</div> <div>工单编号: 12001011</div>
</div> </div>
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" > <starOrder v-if="orderindex==0" ref="starOrder"/>
<Icon type="md-play" /> <MaterialCollec v-else-if="orderindex==1" ref="MaterialCollec"/>
开工</a> <productSet v-else-if="orderindex==2" ref="productSet"/>
</div> <taskTime v-else-if="orderindex==3" ref="taskTime"/>
<div class="star flex fc-b" v-else-if="starmodal"> <preparation v-else-if="orderindex==4" ref="preparation"/>
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <ProcessCheck v-else-if="orderindex==5" ref="ProcessCheck"/>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <ProcessCase v-else-if="orderindex==6" ref="ProcessCase"/>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button> <judgment v-else-if="orderindex==7" ref="judgment"/>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button> <datafilling v-else-if="orderindex==8" ref="datafilling"/>
</div> <testdata v-else-if="orderindex==9" ref="testdata"/>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
<a class="gd_list" @click="orderlistMode = true">工单列表</a> <a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a> <a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- 工单列表 --> <!-- 工单列表 -->
...@@ -71,17 +40,33 @@ ...@@ -71,17 +40,33 @@
</Drawer> </Drawer>
<!-- title="功能区" --> <!-- title="功能区" -->
<Drawer class="gn_box" :closable="false" :inner="true" :transfer="false" v-model="functionalMode"> <Drawer class="gn_box" :closable="false" :inner="true" :transfer="false" v-model="functionalMode">
<functional ref="functional" /> <functional @changeTitle='changeTitle' ref="functional" />
</Drawer> </Drawer>
</div> </div>
</template> </template>
<script> <script>
import functional from "./components/functional"; import functional from "./components/functional";
import orderlist from "./components/orderlist"; import orderlist from "./components/orderlist";
import starOrder from "./starOrder/index";
import MaterialCollec from "./MaterialCollec/index";
import productSet from "./productSet/index";
import taskTime from "./taskTime/index";
import preparation from "./preparation/index";
import ProcessCheck from "./ProcessCheck/index";
import ProcessCase from "./ProcessCase/index";
import judgment from "./judgment/index";
import datafilling from "./datafilling/index";
import testdata from "./testdata/index";
export default { export default {
components: { functional, orderlist}, components: { functional, orderlist,
starOrder,MaterialCollec,productSet,taskTime,preparation,
ProcessCheck,ProcessCase,judgment,datafilling,testdata
},
data(){ data(){
return{ return{
orderTitle:'进度汇报',
orderindex:0,
starmodal: true, starmodal: true,
orderlistMode:false, orderlistMode:false,
functionalMode:false, functionalMode:false,
...@@ -145,6 +130,10 @@ export default { ...@@ -145,6 +130,10 @@ export default {
this.$refs.orderlist.listTasks = newitems this.$refs.orderlist.listTasks = newitems
} }
}, },
changeTitle(number,type){
this.orderTitle = type
this.orderindex = number
},
}, },
} }
</script> </script>
pages/produce/execute/judgment/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
质量判定</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
生产准备</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/productSet/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
产品装配</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/starOrder/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
开工</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: true,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/taskTime/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="gs_set">
<div class="gs_top">
<div class="total_time">
<Icon type="md-pie" />
</div>
<Divider type="vertical" />
<div class="allocated">
<Icon type="md-pie" />
</div>
</div>
<div class="gs_card_box"></div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/testdata/index.vue 0 → 100644
View file @ 31927bd1
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
测试数据</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/technology/add.vue
View file @ 31927bd1
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('version')" prop="version"> <FormItem :label="l('version')" prop="versionid">
<Input v-model="entity.version"></Input> <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
......
pages/technology/detailExamine.vue
View file @ 31927bd1
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Filed :span="6" :name="l('name')">{{info.name}}</Filed> <Filed :span="6" :name="l('name')">{{info.name}}</Filed>
<Filed :span="5" :name="l('code')">{{info.code}}</Filed> <Filed :span="5" :name="l('code')">{{info.code}}</Filed>
<Filed :span="5" :name="l('routingType')"><state code="Process.Routing.routingType" :value="info.routingType" type="text"></state></Filed> <Filed :span="5" :name="l('routingType')"><state code="Process.Routing.routingType" :value="info.routingType" type="text"></state></Filed>
<Filed :span="3" :name="l('version')">{{info.version}}</Filed> <Filed :span="3" :name="l('version')"><state code="Process.Routing.version" :value="info.versionid" type="text"></state></Filed>
</Row> </Row>
</div> </div>
</template> </template>
......
pages/technology/details/routinghcorder/changeInfos.vue
View file @ 31927bd1
...@@ -52,25 +52,25 @@ export default { ...@@ -52,25 +52,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> // <style lang="less">
.detail { // .detail {
display: table; // display: table;
border-collapse: collapse; // border-collapse: collapse;
.ivu-row { // .ivu-row {
display: table-row; // display: table-row;
.filed-col { // .filed-col {
display: table-cell; // display: table-cell;
margin: 0 0 -1px 0; // margin: 0 0 -1px 0;
line-height: 30px; // line-height: 30px;
box-sizing: border-box; // box-sizing: border-box;
.label { // .label {
background: #e8eaf1; // background: #e8eaf1;
display: inline-block; // display: inline-block;
width: 120px; // width: 120px;
text-align: right; // text-align: right;
padding: 0 5px; // padding: 0 5px;
} // }
} // }
} // }
} // }
</style> // </style>
\ No newline at end of file \ No newline at end of file
pages/technology/details/routingqccard/add.vue
View file @ 31927bd1
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</Col> </Col>
--> -->
<Col :span="8"> <Col :span="12">
<FormItem :label="l('routingDetailName')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="entity.routingDetailId"> <Select v-model="entity.routingDetailId">
<Option <Option
...@@ -70,22 +70,42 @@ ...@@ -70,22 +70,42 @@
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('checkParams')" prop="checkParams">
<Input v-model="entity.checkParams"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('standard')" prop="standard"> <FormItem :label="l('standard')" prop="standard">
<Input v-model="entity.standard"></Input> <Input v-model="entity.standard"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('checkType')" prop="checkType">
<Dictionary
code="QC.checktype"
v-model="entity.checkType"
@on-change="checkChange"
type="radio"
></Dictionary>
</FormItem>
</Col>
<Col :span="12" v-if="raidoDis">
<FormItem :label="l('isphotograph')" prop="isphotograph">
<Dictionary code="Process.state" v-model="entity.isphotograph" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('fillintype')" prop="fillintype"> <FormItem :label="l('fillintype')" prop="fillintype">
<Dictionary code="QC.fillintype" v-model="entity.fillintype"></Dictionary> <Dictionary code="QC.fillintype" v-model="entity.fillintype"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="24">
<FormItem :label="l('productionRequirement')" prop="productionRequirement"> <FormItem :label="l('productionRequirement')" prop="productionRequirement">
<Input v-model="entity.productionRequirement" type="textarea" :rows="2"></Input> <Input v-model="entity.productionRequirement"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="24">
<FormItem :label="l('checkContent')" prop="checkContent"> <FormItem :label="l('checkContent')" prop="checkContent">
<Input v-model="entity.checkContent" type="textarea" :rows="2"></Input> <Input v-model="entity.checkContent" type="textarea" :rows="2"></Input>
</FormItem> </FormItem>
...@@ -95,6 +115,7 @@ ...@@ -95,6 +115,7 @@
<files ref="refFile" :parms="parms" files singleFile /> <files ref="refFile" :parms="parms" files singleFile />
</FormItem> </FormItem>
</Col> </Col>
<!--
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isImportant')" prop="isImportant"> <FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary>
...@@ -131,32 +152,20 @@ ...@@ -131,32 +152,20 @@
<Input v-model="entity.measurementUnit"></Input> <Input v-model="entity.measurementUnit"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('checkType')" prop="checkType">
<Dictionary code="QC.checktype" v-model="entity.checkType"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('isphotograph')" prop="isphotograph">
<Dictionary code="Process.state" v-model="entity.isphotograph" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<Dictionary code="Process.Status" v-model="entity.status" type="radio"></Dictionary> <Dictionary code="Process.Status" v-model="entity.status" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24">
<FormItem :label="l('checkParams')" prop="checkParams">
<Input v-model="entity.checkParams" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('remark')" prop="remark"> <FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input> <Input v-model="entity.remark" type="textarea" :rows="2"></Input>
</FormItem> </FormItem>
</Col> </Col>
-->
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
...@@ -172,6 +181,7 @@ export default { ...@@ -172,6 +181,7 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
raidoDis: false,
entity: { entity: {
routingHeaderId: null, routingHeaderId: null,
routingDetailId: null, routingDetailId: null,
...@@ -197,26 +207,29 @@ export default { ...@@ -197,26 +207,29 @@ export default {
samplingBatch: "" samplingBatch: ""
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] routingDetailId: [
{ required: true, message: "请选择工序名称", type: "number" }
],
checkContent: [{ required: true, message: "必填", trigger: "blur" }]
}, },
routingDetailList: [], routingDetailList: [],
parms: { parms: {
app: 'qccard', app: "qccard",
eid: null, eid: null,
name: '', name: "",
field: '' field: ""
} }
}; };
}, },
props: { props: {
v: Object, v: Object,
eid: Number, eid: Number,
headid:Number, headid: Number
}, },
mounted() { mounted() {
this.loadDetails(); this.loadDetails();
this.parms.eid = this.$u.guid() this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles() this.$refs.refFile.intFiles();
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
...@@ -224,20 +237,26 @@ export default { ...@@ -224,20 +237,26 @@ export default {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
this.entity.qualityTemplateName = '' this.entity.qualityTemplateName = "";
this.entity.qualityTemplate='' this.entity.qualityTemplate = "";
if (this.$refs.refFile.nameList.length > 0) { if (this.$refs.refFile.nameList.length > 0) {
let nameList=this.$refs.refFile.nameList let nameList = this.$refs.refFile.nameList;
let names=[] let names = [];
let url=[] let url = [];
nameList.forEach(e => { nameList.forEach(e => {
names.push(e.fileName) names.push(e.fileName);
url.push(e.filePath) url.push(e.filePath);
}); });
this.entity.qualityTemplateName = JSON.stringify(names).replace('[','').replace(']','').replace(/\"/g,'')//附件本地库暂存文件名称 this.entity.qualityTemplateName = JSON.stringify(names)
this.entity.qualityTemplate=JSON.stringify(url).replace('[','').replace(']','').replace(/\"/g,'') .replace("[", "")
.replace("]", "")
.replace(/\"/g, ""); //附件本地库暂存文件名称
this.entity.qualityTemplate = JSON.stringify(url)
.replace("[", "")
.replace("]", "")
.replace(/\"/g, "");
} }
this.entity.routingHeaderId=this.headid this.entity.routingHeaderId = this.headid;
Api.create(this.entity) Api.create(this.entity)
.then(r => { .then(r => {
...@@ -285,19 +304,34 @@ export default { ...@@ -285,19 +304,34 @@ export default {
this.routingDetailList = tempD; this.routingDetailList = tempD;
}); });
}, },
//新增时将uid转为eid //新增时将uid转为eid
updateEid(newId) { updateEid(newId) {
let parms = { let parms = {
eid: this.parms.eid, eid: this.parms.eid,
id: newId + '' id: newId + ""
} };
this.$http.sysUser.updateEid(parms).then((res) => { this.$http.sysUser.updateEid(parms).then(res => {
if (res.status) { if (res.status) {
// this.$Message.success('修改成功!') // this.$Message.success('修改成功!')
} else { } else {
//this.$Message.error('修改失败!') //this.$Message.error('修改失败!')
} }
}) });
},
checkChange(v) {
if (v == 1 || v == 2) {
this.raidoDis = false;
this.entity.isphotograph = null;
} else {
this.raidoDis = true;
if (this.entity.isphotograph == null) {
this.entity.isphotograph = 1;
}
}
},
clearCheck() {
this.raidoDis = false;
this.entity.isphotograph = null;
}, },
l(key) { l(key) {
key = "routing_qc_card" + "." + key; key = "routing_qc_card" + "." + key;
...@@ -310,7 +344,7 @@ export default { ...@@ -310,7 +344,7 @@ export default {
}, },
eid(v) { eid(v) {
if (v > 0) { if (v > 0) {
// this.load(v); // this.load(v);
} }
} }
} }
......
pages/technology/details/routingqccard/detail.vue
View file @ 31927bd1
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('routingHeaderName')" v-if="false">{{entity.routingHeaderId}}</Filed>
<Filed :span="12" :name="l('routingDetailName')">{{entity.routingDetailId}}</Filed>
<Filed :span="12" :name="l('standard')">{{entity.standard}}</Filed> <Filed :span="12" :name="l('standard')">{{entity.standard}}</Filed>
<Filed :span="12" :name="l('fillintype')"> <Filed :span="12" :name="l('fillintype')">
<state code="QC.fillintype" :value="entity.fillintype+''" type="text"></state> <state code="QC.fillintype" :value="entity.fillintype+''" type="text"></state>
...@@ -10,28 +8,11 @@ ...@@ -10,28 +8,11 @@
<Filed :span="12" :name="l('productionRequirement')">{{entity.productionRequirement}}</Filed> <Filed :span="12" :name="l('productionRequirement')">{{entity.productionRequirement}}</Filed>
<Filed :span="12" :name="l('checkContent')">{{entity.checkContent}}</Filed> <Filed :span="12" :name="l('checkContent')">{{entity.checkContent}}</Filed>
<Filed :span="12" :name="l('qualityTemplateName')"><a :href="downUrl+entity.qualityTemplate" target="_blank">{{entity.qualityTemplateName}}</a></Filed> <Filed :span="12" :name="l('qualityTemplateName')"><a :href="downUrl+entity.qualityTemplate" target="_blank">{{entity.qualityTemplateName}}</a></Filed>
<Filed :span="12" :name="l('isImportant')">
<state code="Process.state" :value="entity.isImportant+''" type="text"></state>
</Filed>
<Filed :span="12" :name="l('firstCheck')">
<state code="Process.state" :value="entity.firstCheck+''" type="text"></state>
</Filed>
<Filed :span="12" :name="l('inspection')">
<state code="Process.state" :value="entity.inspection+''" type="text"></state>
</Filed>
<Filed :span="12" :name="l('inspectionTime')">{{entity.inspectionTime}}</Filed>
<Filed :span="12" :name="l('sampling')">
<state code="Process.state" :value="entity.sampling+''" type="text"></state>
</Filed>
<Filed :span="12" :name="l('samplingBatch')">{{entity.samplingBatch}}</Filed>
<Filed :span="12" :name="l('checkType')"> <Filed :span="12" :name="l('checkType')">
<state code="QC.checktype" :value="entity.checkType+''" type="text"></state> <state code="QC.checktype" :value="entity.checkType+''" type="text"></state>
</Filed> </Filed>
<Filed :span="12" :name="l('routingStepId')" v-if="false">{{entity.routingStepId}}</Filed>
<Filed :span="12" :name="l('checkParams')">{{entity.checkParams}}</Filed> <Filed :span="12" :name="l('checkParams')">{{entity.checkParams}}</Filed>
<Filed :span="12" :name="l('measurementUnit')">{{entity.measurementUnit}}</Filed>
<Filed :span="12" :name="l('isphotograph')"> <Filed :span="12" :name="l('isphotograph')">
<state <state
code="Process.state" code="Process.state"
...@@ -39,12 +20,6 @@ ...@@ -39,12 +20,6 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="12" :name="l('status')">
<state code="Process.state" :value="entity.status+''" type="text"></state>
</Filed>
<Filed :span="12" :name="l('extend')" v-if="false">{{entity.extend}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')"> <Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User> <User :value="entity.creatorUserId"></User>
......
pages/technology/details/routingqccard/edit.vue
View file @ 31927bd1
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row> <Row>
<!--
<Col :span="12"> <Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<Input v-model="entity.isDeleted"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('routingStepId')" prop="routingStepId">
<InputNumber v-model="entity.routingStepId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('extend')" prop="extend">
<Input v-model="entity.extend"></Input>
</FormItem>
</Col>
-->
<Col :span="8">
<FormItem :label="l('routingDetailName')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="entity.routingDetailId"> <Select v-model="entity.routingDetailId">
<Option <Option
...@@ -59,91 +12,56 @@ ...@@ -59,91 +12,56 @@
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('standard')" prop="standard">
<Input v-model="entity.standard"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('fillintype')" prop="fillintype">
<Dictionary code="QC.fillintype" v-model="entity.fillintype"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('productionRequirement')" prop="productionRequirement">
<Input v-model="entity.productionRequirement" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('checkContent')" prop="checkContent"> <FormItem :label="l('checkParams')" prop="checkParams">
<Input v-model="entity.checkContent" type="textarea" :rows="2"></Input> <Input v-model="entity.checkParams"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
<files ref="refFile" :parms="parms" files singleFile />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isImportant')" prop="isImportant"> <FormItem :label="l('standard')" prop="standard">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary> <Input v-model="entity.standard"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('firstCheck')" prop="firstCheck">
<Dictionary code="Process.state" v-model="entity.firstCheck" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('inspection')" prop="inspection">
<Dictionary code="Process.state" v-model="entity.inspection" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('inspectionTime')" prop="inspectionTime">
<InputNumber v-model="entity.inspectionTime"></InputNumber>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('sampling')" prop="sampling">
<Dictionary code="Process.state" v-model="entity.sampling" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('samplingBatch')" prop="samplingBatch">
<Input v-model="entity.samplingBatch"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('measurementUnit')" prop="measurementUnit">
<Input v-model="entity.measurementUnit"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('checkType')" prop="checkType"> <FormItem :label="l('checkType')" prop="checkType">
<Dictionary code="QC.checktype" v-model="entity.checkType"></Dictionary> <Dictionary
code="QC.checktype"
v-model="entity.checkType"
@on-change="checkChange"
type="radio"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12" v-if="raidoDis">
<FormItem :label="l('isphotograph')" prop="isphotograph"> <FormItem :label="l('isphotograph')" prop="isphotograph">
<Dictionary code="Process.state" v-model="entity.isphotograph" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isphotograph" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('fillintype')" prop="fillintype">
<Dictionary code="Process.Status" v-model="entity.status" type="radio"></Dictionary> <Dictionary code="QC.fillintype" v-model="entity.fillintype"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('checkParams')" prop="checkParams"> <FormItem :label="l('productionRequirement')" prop="productionRequirement">
<Input v-model="entity.checkParams" type="textarea" :rows="2"></Input> <Input v-model="entity.productionRequirement"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('checkContent')" prop="checkContent">
<Input v-model="entity.checkContent" type="textarea" :rows="2"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('remark')" prop="remark"> <FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input> <files ref="refFile" :parms="parms" files singleFile />
<!--
<a
:href="fileUrlPath"
@click="downFile(entity.qualityTemplate)"
target="_blank"
>{{entity.qualityTemplateName}}</a>
-->
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -161,12 +79,18 @@ export default { ...@@ -161,12 +79,18 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
raidoDis: false,
downUrl: fileUrlDown,
fileUrlPath: "",
entity: { entity: {
qualityTemplateName: "", qualityTemplateName: "",
qualityTemplate: "" qualityTemplate: ""
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] routingDetailId: [
{ required: true, message: "请选择工序名称", type: "number" }
],
checkContent: [{ required: true, message: "必填", trigger: "blur" }]
}, },
routingDetailList: [], routingDetailList: [],
parms: { parms: {
...@@ -192,9 +116,20 @@ export default { ...@@ -192,9 +116,20 @@ export default {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
this.$refs.refFile.intFilesClone(); this.$refs.refFile.intFilesClone();
this.parms.eid = v;
this.entity = r.result; this.entity = r.result;
if (r.result.checkType == 1 || r.result.checkType == 2) {
this.raidoDis = false;
this.entity.isphotograph = null;
} else {
this.raidoDis = true;
}
}); });
}, },
downFile(path) {
this.fileUrlPath = this.downUrl + path;
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
...@@ -257,7 +192,17 @@ export default { ...@@ -257,7 +192,17 @@ export default {
this.routingDetailList = tempD; this.routingDetailList = tempD;
}); });
}, },
checkChange(v) {
if (v == 1 || v == 2) {
this.raidoDis = false;
this.entity.isphotograph = null;
} else {
this.raidoDis = true;
if (this.entity.isphotograph == null) {
this.entity.isphotograph = 1;
}
}
},
l(key) { l(key) {
key = "routing_qc_card" + "." + key; key = "routing_qc_card" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routingqccard/index.vue
View file @ 31927bd1
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1000" footer-hide>
<component :is="detail" :eid="curId" :headid="hid" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" :headid="hid" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -58,7 +58,6 @@ export default { ...@@ -58,7 +58,6 @@ export default {
curId: 0, curId: 0,
hid: 0, hid: 0,
columns: [ columns: [
{ {
key: "routingDetailNo", key: "routingDetailNo",
title: this.l("routingDetailNo"), title: this.l("routingDetailNo"),
...@@ -71,30 +70,16 @@ export default { ...@@ -71,30 +70,16 @@ export default {
key: "routingDetailName", key: "routingDetailName",
title: this.l("routingDetailName"), title: this.l("routingDetailName"),
align: "left", align: "left",
high: true
},
{
key: "checkType",
title: this.l("checkType"),
align: "left",
high: true, high: true,
code: "QC.checktype", tooltip:true,
width:100,
}, },
{ {
key: "checkParams", key: "checkParams",
title: this.l("checkParams"), title: this.l("checkParams"),
align: "left", align: "left",
easy: true, easy: true,
high: true
},
{
key: "measurementUnit",
title: this.l("measurementUnit"),
align: "left",
easy: true,
high: true, high: true,
hide:true, tooltip:true,
}, },
{ {
key: "fillintype", key: "fillintype",
...@@ -103,6 +88,14 @@ export default { ...@@ -103,6 +88,14 @@ export default {
high: true, high: true,
code: "QC.fillintype", code: "QC.fillintype",
width:140, width:140,
},
{
key: "checkType",
title: this.l("checkType"),
align: "center",
high: true,
code: "QC.checktype",
width:100,
}, },
{ {
key: "isphotograph", key: "isphotograph",
...@@ -113,12 +106,12 @@ export default { ...@@ -113,12 +106,12 @@ export default {
width:100, width:100,
}, },
{ {
key: "status", key: "standard",
title: this.l("status"), title: this.l("standard"),
align: "center", align: "left",
easy: true,
high: true, high: true,
code: "Process.Status", tooltip:true,
width:80,
}, },
{ {
key: "productionRequirement", key: "productionRequirement",
...@@ -126,15 +119,16 @@ export default { ...@@ -126,15 +119,16 @@ export default {
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true tooltip:true,
},
{
key: "checkContent",
title: this.l("checkContent"),
align: "left",
easy: true,
high: true,
tooltip:true,
}, },
// {
// key: "standard",
// title: this.l("standard"),
// align: "left",
// easy: true,
// high: true,
// },
{ {
key: "qualityTemplateName", key: "qualityTemplateName",
title: this.l("qualityTemplateName"), title: this.l("qualityTemplateName"),
...@@ -155,53 +149,6 @@ export default { ...@@ -155,53 +149,6 @@ export default {
]); ]);
} }
}, },
{
key: "isImportant",
title: this.l("isImportant"),
align: "center",
high: true,
code: "Process.state",
width:100,
},
{
key: "firstCheck",
title: this.l("firstCheck"),
align: "center",
high: true,
code: "Process.state",
width:100,
},
{
key: "inspection",
title: this.l("inspection"),
align: "center",
high: true,
code: "Process.state",
width:80,
},
{
key: "inspectionTime",
title: this.l("inspectionTime"),
align: "left",
high: true,
hide: true
},
{
key: "sampling",
title: this.l("sampling"),
align: "center",
high: true,
code: "Process.state",
width:80,
},
{
key: "samplingBatch",
title: this.l("samplingBatch"),
align: "left",
easy: true,
high: true,
hide: true
},
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
......
pages/technology/details/routingqccard/search.vue
View file @ 31927bd1
...@@ -23,10 +23,15 @@ ...@@ -23,10 +23,15 @@
<Dictionary code="QC.checktype" v-model="condition.checkType.value"></Dictionary> <Dictionary code="QC.checktype" v-model="condition.checkType.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" v-if="condition.checkParams.show"> <Col :span="12" v-if="condition.checkParams.show">
<FormItem :label="l('checkParams')" prop="checkParams"> <FormItem :label="l('checkParams')" prop="checkParams">
<Input v-model="condition.checkParams.value"></Input> <Input v-model="condition.checkParams.value"></Input>
</FormItem> </FormItem>
</Col>
<Col :span="12" v-if="condition.standard.show">
<FormItem :label="l('standard')" prop="standard">
<Input v-model="condition.standard.value"></Input>
</FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.measurementUnit.show"> <Col :span="12" v-if="condition.measurementUnit.show">
<FormItem :label="l('measurementUnit')" prop="measurementUnit"> <FormItem :label="l('measurementUnit')" prop="measurementUnit">
...@@ -63,11 +68,7 @@ ...@@ -63,11 +68,7 @@
<Input v-model="condition.productionRequirement.value"></Input> <Input v-model="condition.productionRequirement.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" v-if="condition.standard.show">
<FormItem :label="l('standard')" prop="standard">
<Input v-model="condition.standard.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.qualityTemplateName.show"> <Col :span="12" v-if="condition.qualityTemplateName.show">
<FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName"> <FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
<Input v-model="condition.qualityTemplateName.value"></Input> <Input v-model="condition.qualityTemplateName.value"></Input>
...@@ -153,22 +154,22 @@ export default { ...@@ -153,22 +154,22 @@ export default {
routingDetailId: { op: "Equal", value: null, show: true }, routingDetailId: { op: "Equal", value: null, show: true },
routingStepId: { op: "Equal", value: null, show: false }, routingStepId: { op: "Equal", value: null, show: false },
checkType: { op: "Equal", value: null, show: true }, checkType: { op: "Equal", value: null, show: true },
checkParams: { op: "Equal", value: null, show: false }, checkParams: { op: "Equal", value: null, show: true },
measurementUnit: { op: "Equal", value: null, show: true }, measurementUnit: { op: "Equal", value: null, show: false },
fillintype: { op: "Equal", value: null, show: true }, fillintype: { op: "Equal", value: null, show: true },
qualityTemplate: { op: "Equal", value: null, show: false }, qualityTemplate: { op: "Equal", value: null, show: false },
isphotograph: { op: "Equal", value: null, show: true }, isphotograph: { op: "Equal", value: null, show: true },
status: { op: "Equal", value: null, show: true }, status: { op: "Equal", value: null, show: false },
remark: { op: "Equal", value: null, show: false }, remark: { op: "Equal", value: null, show: false },
productionRequirement: { op: "Equal", value: null, show: false }, productionRequirement: { op: "Equal", value: null, show: true },
standard: { op: "Equal", value: null, show: false }, standard: { op: "Equal", value: null, show: true },
qualityTemplateName: { op: "Equal", value: null, show: false }, qualityTemplateName: { op: "Equal", value: null, show: false },
isImportant: { op: "Equal", value: null, show: true }, isImportant: { op: "Equal", value: null, show: false },
firstCheck: { op: "Equal", value: null, show: true }, firstCheck: { op: "Equal", value: null, show: false },
inspection: { op: "Equal", value: null, show: true }, inspection: { op: "Equal", value: null, show: false },
inspectionTime: { op: "Equal", value: null, show: true }, inspectionTime: { op: "Equal", value: null, show: false },
sampling: { op: "Equal", value: null, show: true }, sampling: { op: "Equal", value: null, show: false },
samplingBatch: { op: "Equal", value: null, show: true } samplingBatch: { op: "Equal", value: null, show: false }
}, },
routingDetailList: [], routingDetailList: [],
}; };
......
pages/technology/edit.vue
View file @ 31927bd1
...@@ -11,16 +11,17 @@ ...@@ -11,16 +11,17 @@
<Input v-model="entity.unicode"></Input> <Input v-model="entity.unicode"></Input>
</FormItem> </FormItem>
</Col>--> </Col>-->
<Col :span="8"> <Col :span="8">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('code')" prop="code">
<Input v-model="entity.name"></Input> <Input v-model="entity.code" disabled></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.code"></Input> <Input v-model="entity.name"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('routingType')" prop="routingType"> <FormItem :label="l('routingType')" prop="routingType">
<Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary> <Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary>
...@@ -42,8 +43,8 @@ ...@@ -42,8 +43,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('version')" prop="version"> <FormItem :label="l('version')" prop="versionid">
<Input v-model="entity.version"></Input> <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -51,17 +52,18 @@ ...@@ -51,17 +52,18 @@
<departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('isSendPpm')" prop="isSendPpm">
<Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('isEffect')" prop="isEffect"> <FormItem :label="l('isEffect')" prop="isEffect">
<Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary> <Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<!-- <!--
<Col :span="8">
<FormItem :label="l('isSendPpm')" prop="isSendPpm">
<Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('isMain')" prop="isMain"> <FormItem :label="l('isMain')" prop="isMain">
<Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
......
pages/technology/index.vue
View file @ 31927bd1
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
</div> </div>
</Modal> </Modal>
<!-- 工艺更改弹框 --> <!-- 工艺更改弹框 -->
<routingchangeorder ref="routingchangeorder"></routingchangeorder> <routingchangeorder ref="routingchangeorder"></routingchangeorder>
<!-- 工艺更改表弹框 --> <!-- 工艺更改表弹框 -->
<changelist ref="changelist"></changelist> <changelist ref="changelist"></changelist>
<div class="fullWindow flex fd" v-if="viewModal"> <div class="fullWindow flex fd" v-if="viewModal">
<div class="top flex"> <div class="top flex">
<div v-width="200"> <div v-width="200">
...@@ -116,14 +116,20 @@ ...@@ -116,14 +116,20 @@
<script> <script>
import Api from "./api"; import Api from "./api";
import service from '@/plugins/request' import service from "@/plugins/request";
import Search from "./search"; import Search from "./search";
import ProductTree from "@/components/page/productTree.vue"; import ProductTree from "@/components/page/productTree.vue";
import sendAudit from "./sendAudit.vue"; import sendAudit from "./sendAudit.vue";
import routingchangeorder from '../processDesign/Process/routingchangeorder.vue' import routingchangeorder from "../processDesign/Process/routingchangeorder.vue";
import changelist from '../processDesign/Process/changelist.vue' import changelist from "../processDesign/Process/changelist.vue";
export default { export default {
components: { ProductTree, Search, sendAudit,routingchangeorder,changelist }, components: {
ProductTree,
Search,
sendAudit,
routingchangeorder,
changelist
},
head: { head: {
title: "工艺规程", title: "工艺规程",
author: "henq", author: "henq",
...@@ -147,7 +153,6 @@ export default { ...@@ -147,7 +153,6 @@ export default {
uId: "", uId: "",
documentShow: false, documentShow: false,
columns: [ columns: [
{ {
key: "code", key: "code",
title: this.l("code"), title: this.l("code"),
...@@ -171,7 +176,21 @@ export default { ...@@ -171,7 +176,21 @@ export default {
width: 100, width: 100,
code: "Process.Routing.phase" code: "Process.Routing.phase"
}, },
{ key: "version", title: this.l("version"), align: "left", high: true,width: 100, }, {
key: "versionid",
title: this.l("version"),
align: "center",
high: true,
width: 100,
code:"Process.Routing.version"
},
{
title: this.l("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code:"process.RoutingStatus"
},
{ {
key: "routingType", key: "routingType",
title: this.l("routingType"), title: this.l("routingType"),
...@@ -212,7 +231,7 @@ export default { ...@@ -212,7 +231,7 @@ export default {
// { key:"upDetailId",title:this.l("upDetailId") ,hide:true ,align:"left" ,high:true }, // { key:"upDetailId",title:this.l("upDetailId") ,hide:true ,align:"left" ,high:true },
//{ key: "classId", title: this.l("classId"), align: "left", hide: true }, //{ key: "classId", title: this.l("classId"), align: "left", hide: true },
//{ key: "unicode", title: this.l("unicode"),align: "left",easy: false,hide: true}, //{ key: "unicode", title: this.l("unicode"),align: "left",easy: false,hide: true},
// { key:"status",title:this.l("status") ,align:"left" ,high:true ,code:'Process.Status' },
// { key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'process.RoutingStatus' }, // { key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'process.RoutingStatus' },
// { key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true }, // { key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true },
// { key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true }, // { key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true },
...@@ -285,7 +304,7 @@ export default { ...@@ -285,7 +304,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row) } on: { click: () => this.edit(params.row) }
}, },
"编辑" params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -293,15 +312,15 @@ export default { ...@@ -293,15 +312,15 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "删除" : ""
), ),
h( h(
"op", "op",
{ {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" }
// on: { click: () => this.TechnologyChange(params.row) } // on: { click: () => this.TechnologyChange(params.row) }
}, },
"新增更改单" params.row.approvalStatus == 1 ? "新增更改单" : ""
), ),
h( h(
"op", "op",
...@@ -462,48 +481,46 @@ export default { ...@@ -462,48 +481,46 @@ export default {
}, },
//工艺更改 //工艺更改
TechnologyChange(row) { TechnologyChange(row) {
this.$refs.routingchangeorder.flag = 0 this.$refs.routingchangeorder.flag = 0;
this.$refs.routingchangeorder.routing_header_Id = row.id this.$refs.routingchangeorder.routing_header_Id = row.id;
var userId =this.$store.state.userInfo.userId var userId = this.$store.state.userInfo.userId;
let parma = { let parma = {
Id: userId Id: userId
} };
this.$refs.routingchangeorder.changeorder_code = '' this.$refs.routingchangeorder.changeorder_code = "";
this.$http.sysUser.getuserinfo(parma).then((res) => { this.$http.sysUser.getuserinfo(parma).then(res => {
if (res.result) { if (res.result) {
this.$refs.routingchangeorder.formValidate = { this.$refs.routingchangeorder.formValidate = {
technical_name: row.name, technical_name: row.name,
technical_code: row.code, technical_code: row.code,
department_name: res.result.departmentTitle, department_name: res.result.departmentTitle,
propose_user_name: res.result.userName propose_user_name: res.result.userName
} };
} }
}) });
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD` var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`;
service.get(`${url1}`).then((response) => { service.get(`${url1}`).then(response => {
this.$refs.routingchangeorder.changeorder_code = response.result this.$refs.routingchangeorder.changeorder_code = response.result;
}) });
this.$refs.routingchangeorder.modelChange = true this.$refs.routingchangeorder.modelChange = true;
}, },
Main(data) { Main(data) {
// this.eid1 = '' // this.eid1 = ''
this.seleId = data.row.id this.seleId = data.row.id;
this.$refs.changelist.seleId = data.row.id this.$refs.changelist.seleId = data.row.id;
let url = `${designUrl}/routingheaderchangeorder/getpaged` let url = `${designUrl}/routingheaderchangeorder/getpaged`;
service service.get(`${url}`, { routing_header_id: this.seleId }).then(res => {
.get(`${url}`, { routing_header_id: this.seleId }) //console.log(res)
.then((res) => { this.$refs.changelist.data2 = res.result.items;
//console.log(res) this.$refs.changelist.myloading = false;
this.$refs.changelist.data2 = res.result.items if (this.$refs.changelist.data2.length == 0) {
this.$refs.changelist.myloading = false this.$Message.error("该工艺规程没有更改单！");
if (this.$refs.changelist.data2.length == 0) { this.$refs.changelist.show3 = false;
this.$Message.error('该工艺规程没有更改单！') return;
this.$refs.changelist.show3 = false }
return this.$refs.changelist.show3 = true;
} });
this.$refs.changelist.show3 = true
})
} }
} }
}; };
......
pages/workflow/process/design.vue
View file @ 31927bd1
...@@ -107,6 +107,7 @@ export default { ...@@ -107,6 +107,7 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.Design { .Design {
background: white;
padding: 20px 50px; padding: 20px 50px;
.node { .node {
.title { .title {
......
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