plm BM

index.html

@@ -10,7 +10,8 @@
   <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
   <% }else { %>
   <!-- 开发环境 -->
-  <link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico">
+<!--  <link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico">-->
+  <link rel="shortcut icon" type="image/x-icon" href="./static/img/ccl2.png" >
   <script src="./static/config/index.js"></script>
   <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
   <script src="./static/plugins/echarts-3.8.5/echarts.common.min.js"></script>

src/views/main-navbar.vue

@@ -10,7 +10,7 @@
             <icon-svg name="zhedie"></icon-svg>
           </el-menu-item>
         </el-menu>
-        <a class="site-navbar__brand-lg" href="javascript:;">{{ pageLanguage.XjSysManage }}</a>
+        <a class="site-navbar__brand-lg" href="javascript:;">{{'产品生命周期管理系统'}}</a>
         <a class="site-navbar__brand-mini" href="javascript:;">{{ pageLanguage.abbreviation }}</a>
       </h1>
 
@@ -63,7 +63,7 @@
         <el-menu-item class="site-navbar__avatar" index="4">
           <el-dropdown :show-timeout="0" placement="bottom">
                       <span class="el-dropdown-link">
-                        <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
+                        <img src="~@/assets/img/ccl.png" :alt="userName">{{ userName }}
                       </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
@@ -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 {

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -2,7 +2,7 @@
   <div class="mod-config">
     <el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
       <el-form-item  label="Process">
-        <el-input v-model="sheetData.process"  style="width: 254px"></el-input>
+        <dict-data-select  v-model="sheetData.process" dict-type="bm_process" style="width: 120px"></dict-data-select>
       </el-form-item>
       <el-form-item >
           <span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">热转移打印人员</a></span>
@@ -427,6 +427,7 @@
       </el-footer>
     </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
   </div>
 </template>
 
@@ -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,

src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@@ -23,11 +23,11 @@
             <el-input v-model="dataForm.finalPartNo" disabled  ></el-input>
           </el-form-item>
         </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'P/N Rev.'">
-            <el-input v-model="dataForm.partRevNo" disabled  ></el-input>
-          </el-form-item>
-        </div></el-col>
+<!--        <el-col :span="6"><div class="grid-content bg-purple">-->
+<!--          <el-form-item :label="'P/N Rev.'">-->
+<!--            <el-input v-model="dataForm.partRevNo" disabled  ></el-input>-->
+<!--          </el-form-item>-->
+<!--        </div></el-col>-->
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6"><div class="grid-content bg-purple">
@@ -46,8 +46,8 @@
           </el-form-item>
         </div></el-col>
         <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'状态/Status'">
-            <el-input v-model="dataForm.status" :disabled="ifDisableFlag" style="" ></el-input>
+          <el-form-item :label="'BU'">
+            <el-input v-model="dataForm.buNo" disabled style="" ></el-input>
           </el-form-item>
         </div></el-col>
 <!--        <el-col :span="12"><div class="grid-content bg-purple">-->
@@ -232,6 +232,7 @@
         technicianList:[],
         dataForm:{
           process:'',
+          buNo:'',
           site: '',
           codeNo:'',
           revNo:'',

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,