查询出入库明细导出Excel问题

src/views/inventory/supInoutSearchOrder.vue

@@ -487,7 +487,7 @@ export default {
 
     },
     searchExport() {
-      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+      this.$confirm("是否确定导出所有查询结果数据", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -506,8 +506,14 @@ export default {
             keyWords: this.filterQuery.keyWords,
             mainAction: this.filterQuery.mainAction,
             action: this.filterQuery.action
-
           };
+
+          if (this.filterQuery.actionType == 'preInDetail') {
+            printParams.invCode = '1000001'
+          } else if (this.filterQuery.actionType == 'preDetail') {
+            printParams.invCode = '1000002'
+          }
+
           if (this.actDateRange !== null) {
             printParams.startAduditTime = this.actDateRange[0];
             printParams.endAduditTime = this.actDateRange[1];

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -109,7 +109,6 @@
         <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
         <el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
-
         <el-table-column
           v-if="productRemarkSet.remarkEnable1"
           :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
@@ -118,7 +117,14 @@
           v-if="productRemarkSet.remarkEnable2"
           :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
           show-overflow-tooltip></el-table-column>
-
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable3"
+          :label="productRemarkSet.remarkTitle3" prop="basicPrductRemak3" width="140"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable4"
+          :label="productRemarkSet.remarkTitle4" prop="basicPrductRemak4" width="140"
+          show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="80" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>