Просмотр исходного кода

去除菌株细胞标签条码,首页已办办结提交人修改

cfort 3 лет назад
Родитель
Сommit
3fcd433aef

+ 2 - 2
src/business/platform/data/templaterender/components/print.vue

@@ -22,14 +22,14 @@
                             <span class="value">{{ item[o.value] }}</span>
                         </div>
                     </template>
-                    <vue-barcode
+                    <!-- <vue-barcode
                         :value="item.bianHao"
                         :width="3"
                         :height="40"
                         :fontSize="0"
                         :margin="0"
                         class="barcode"
-                    ></vue-barcode>
+                    ></vue-barcode> -->
                 </div>
             </div>
         </vue-easy-print>

+ 12 - 3
src/views/system/dashboard/components/new-home.vue

@@ -151,13 +151,13 @@
                                 >
                                     <template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
                                 </el-table-column>
-                                <!-- <el-table-column
+                                <el-table-column
                                     show-overflow-tooltip
                                     label="提交人"
                                     width="100"
                                 >
-                                    <template slot-scope="scope">{{ getParenthesesStr(scope.row.subject)[2] }}</template>
-                                </el-table-column> -->
+                                    <template slot-scope="scope">{{ getName(scope.row) }}</template>
+                                </el-table-column>
                             </template>
                             <el-table-column show-overflow-tooltip width="160" :key="Date.now() + Math.random()">
                                 <template slot="header" slot-scope="scope">
@@ -415,6 +415,15 @@
             handleExpandCollapse(isExpand) {
                 this.width = isExpand ? 230 : 30
             },
+            getName ({createBy, updateBy}) {
+                const id = updateBy ? updateBy : createBy
+                const { name = '' } = this.$store.getters
+                if (this.activeTab === 'finish') {
+                    let t = this.userList.find(i => i.userId === id)
+                    return t ? t.userName : ''
+                }
+                return name
+            },
             tableRowClassName({ row, rowIndex }) {
                 if (rowIndex % 2 === 1) return 'warning-row'
                 return 'success-row'