Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/views/chemicalManage/inventoryManagement/takeRecord/index.vue

@@ -117,11 +117,7 @@
               <span>{{scope.row.surplus}}{{scope.row.specUnit}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="出库方式" prop="content" width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{scope.row.status==2?'用结出库':(scope.row.status==3?'作废出库':(scope.row.status==4?'整瓶领用':''))}}</span>
-            </template>
-          </el-table-column>
+          <el-table-column label="出库方式" prop="statusStr" width="100" show-overflow-tooltip> </el-table-column>
           <el-table-column label="出库时间" prop="outTime" width="150" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.outTime,"{y}-{m}-{d} {h}:{i}") }}</span>
@@ -182,7 +178,7 @@
         searchOptions:[],
         categoryOptions:[],
         //下拉列表数据
-        optionList:[{value:2,label:'用结出库'},{value:3,label:'作废出库'},{value:4,label:'整瓶领用'}],
+        optionList:[{value:2,label:'空瓶出库'},{value:3,label:'废弃出库'},{value:4,label:'整瓶领用'}],
         //查询条件
         queryParams:{
           page:1,