Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/invoicing/consumable/specifications.vue

@@ -181,12 +181,19 @@
                       v-for="(haocai, index) in scope.row.haocais"
                       :key="index"
                     >
+                    <template v-if="haocai.conName">
+                      <div>{{ haocai.conName }}</div>
+                    </template>
+                    <template v-else>
                       <el-input
                         disabled
                         v-model="haocai.conName"
                         style="width: 130px"
                         placeholder="请选择耗材信息"
                       ></el-input>
+                    </template>
+                     
+
                     </div>
                   </div>
                 </template>