From 4e798445a28a5be491b08b2c006459800aec806c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 28 Nov 2023 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BAExcel=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/supInoutSearchOrder.vue   |  10 +-
 .../purApply/purOrderSelectProduct.vue        | 126 +++++++++---------
 2 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 50ced752..d042400f 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/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];
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 77daa3ad..75a2fe88 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -4,7 +4,7 @@
       <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
           <el-col :span="18">
-            <el-form-item label="UDI码:" >
+            <el-form-item label="UDI码:">
               <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
                         @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
@@ -12,25 +12,25 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="拼音简写:" >
+            <el-form-item label="拼音简写:">
               <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方物资编码:" >
+            <el-form-item label="第三方物资编码:">
               <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分类编码:" >
+            <el-form-item label="分类编码:">
               <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="供应商:" >
+            <el-form-item label="供应商:">
               <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
                         clearable="true"></el-input>
             </el-form-item>
@@ -38,24 +38,24 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="DI/物资编码:" >
+            <el-form-item label="DI/物资编码:">
               <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="物资名称:" >
+            <el-form-item label="物资名称:">
               <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规格型号:" >
+            <el-form-item label="规格型号:">
               <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产企业:" >
+            <el-form-item label="生产企业:">
               <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
                         clearable="true"></el-input>
             </el-form-item>
@@ -64,20 +64,20 @@
 
         <el-row>
           <el-col :span="6">
-            <el-form-item label="物资分类:" >
+            <el-form-item label="物资分类:">
               <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'" >
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
               <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"
                         :placeholder="productRemarkSet.remarkTitle1"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" >
+            <el-form-item :label="productRemarkSet.remarkTitle2 +':'">
               <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"
                         :placeholder="productRemarkSet.remarkTitle2"
                         clearable="true"></el-input>
@@ -109,16 +109,22 @@
         <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"
-            show-overflow-tooltip></el-table-column>
+          v-if="productRemarkSet.remarkEnable1"
+          :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
+          show-overflow-tooltip></el-table-column>
         <el-table-column
-            v-if="productRemarkSet.remarkEnable2"
-            :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
-            show-overflow-tooltip></el-table-column>
-
+          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>
@@ -127,23 +133,23 @@
       </el-table>
 
       <pagination
-          v-show="pageTotal>0"
-          :total="pageTotal"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.limit"
-          @pagination="handleErpPageChange"
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
 
       ></pagination>
     </el-card>
 
     <el-dialog
-        title="耗材字典详情"
-        :visible.sync="udiRlDetailVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        append-to-body
-        v-if="udiRlDetailVisible"
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
     >
       <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
     </el-dialog>
@@ -366,43 +372,43 @@ export default {
       this.listQuery.customerId = store.getters.customerId;
       this.listQuery.id = this.pId;
       filterCompanyProductplanRelevance(this.listQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.dataList = response.data.list || [];
-              this.pageTotal = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-              this.dataList = [];
-              this.pageTotal = 0;
-            }
-          })
-          .catch(() => {
-            this.loading = false;
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
             this.dataList = [];
             this.pageTotal = 0;
-          });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
     },
 
     getRationList() {
       this.loading = true;
       filterCompanyProductRationRelevance(this.listQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.dataList = response.data.list || [];
-              this.pageTotal = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-              this.dataList = [];
-              this.pageTotal = 0;
-            }
-          })
-          .catch(() => {
-            this.loading = false;
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
             this.dataList = [];
             this.pageTotal = 0;
-          });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
     },
     intentBack() {
       this.closeDialog();