Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -338,7 +338,7 @@
           <el-table-column align="center" label="采购数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.采购数量 }}
-              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
+              <!--{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}-->
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数量" width="100px">

src/views/PurchasingCenter/ReceiveCheck/index.vue

@@ -326,7 +326,7 @@ export default {
       param[6] = ['机床号物料名称_check', check4]
       param[7] = ['机床号物料名称', this.machinenum]
       param[8] = ['合计', this.totalPrice]
-      param[9] = ['表名', '采购核算']
+      param[9] = ['表名', '领用核算']
       var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
       this.exportExcel_NPOI(Data)
     }