diff --git a/index.html b/index.html index 8ad7e1a..627dfac 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,8 @@ <% }else { %> - + + diff --git a/src/assets/img/ccl.png b/src/assets/img/ccl.png new file mode 100644 index 0000000..fe3590f Binary files /dev/null and b/src/assets/img/ccl.png differ diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index a469794..a2d1a19 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -10,7 +10,7 @@ - {{ pageLanguage.XjSysManage }} + {{'产品生命周期管理系统'}} {{ pageLanguage.abbreviation }} @@ -63,7 +63,7 @@ - {{ userName }} + {{ userName }} 退出 @@ -483,7 +483,8 @@ export default { .site-navbar__brand-lg, .site-navbar__brand-mini { margin: 0 5px; color: #fff; - margin-left: -45px; + margin-left: -25px; + font-size: 17px; } .el-menu--horizontal > .el-menu-item { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index bce10e0..a978ae7 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -2,7 +2,7 @@
- + 热转移打印人员 @@ -427,6 +427,7 @@ +
@@ -461,9 +462,12 @@ import fqc from "./com_bm_demoSlot";/*组件*/ import cqc from "./com_bm_demoSlot";/*组件*/ import printFlexo from "./com_bm_printingFlexo";/*组件*/ - import printIndigo from "./com_bm_printingIndigo";/*组件*/ + import printIndigo from "./com_bm_printingIndigo"; + import DictDataSelect from "../../sys/dict-data-select"; + /*组件*/ export default { components: { + DictDataSelect, Chooselist, prepress, printing, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 099a620..5f7d1fa 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -23,11 +23,11 @@ -
- - - -
+ + + + +
@@ -46,8 +46,8 @@
- - + +
@@ -232,6 +232,7 @@ technicianList:[], dataForm:{ process:'', + buNo:'', site: '', codeNo:'', revNo:'', diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 6f4da5b..ecf774d 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -482,40 +482,40 @@ status: true, fixed: '', columnWidth: 100 - },{ - userId: this.$store.state.user.name, - functionId: 103002, - serialNumber: '103002Table1TestPartNo', - tableId: "103002Table1", - tableName: "技术参数卡列表", - columnProp: "buNo", - headerAlign: "center", - align: "center", - columnLabel: "BU", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - },{ - userId: this.$store.state.user.name, - functionId: 103002, - serialNumber: '103002Table1TestPartNo', - tableId: "103002Table1", - tableName: "技术参数卡列表", - columnProp: "buDesc", - headerAlign: "center", - align: "left", - columnLabel: "BU名称", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 + // },{ + // userId: this.$store.state.user.name, + // functionId: 103002, + // serialNumber: '103002Table1TestPartNo', + // tableId: "103002Table1", + // tableName: "技术参数卡列表", + // columnProp: "buNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "BU", + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 80 + // },{ + // userId: this.$store.state.user.name, + // functionId: 103002, + // serialNumber: '103002Table1TestPartNo', + // tableId: "103002Table1", + // tableName: "技术参数卡列表", + // columnProp: "buDesc", + // headerAlign: "center", + // align: "left", + // columnLabel: "BU名称", + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 103002, diff --git a/static/img/ccl.png b/static/img/ccl.png new file mode 100644 index 0000000..fe3590f Binary files /dev/null and b/static/img/ccl.png differ diff --git a/static/img/ccl2.png b/static/img/ccl2.png new file mode 100644 index 0000000..0c5710a Binary files /dev/null and b/static/img/ccl2.png differ