From 2cb7e20ca3934f468441adaa9a4b21cf9e19949a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 24 May 2023 14:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  4 +-
 .env.production                              |  4 +-
 src/views/basic/product/product.vue          | 91 ++++++++++++--------
 src/views/inout/IoCheckAuditOrder.vue        | 49 ++++++++++-
 src/views/system/param/systemParamConfig.vue |  1 +
 vue.config.js                                |  2 +-
 6 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/.env.development b/.env.development
index 1562a5da..e15349a3 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,8 @@ VUE_APP_TITLE = UDI管理系统
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+# 开发环境
+VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
diff --git a/.env.production b/.env.production
index 363a780f..b3922466 100644
--- a/.env.production
+++ b/.env.production
@@ -23,11 +23,11 @@ ENV = 'production'
 # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 # VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER"
 
 # 吴总测试服务器
-VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index d09a965b..7b464b90 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -13,8 +13,8 @@
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span style="font-size: 14px; font-weight: 500">{{
-                  node.label
-                }}</span></span
+                    node.label
+                  }}</span></span
               >
             </el-tree>
           </el-col>
@@ -182,32 +182,38 @@
           <div class="top-right-btn">
             <el-button-group>
               <el-button icon="el-icon-view" type="primary" @click="hideSearch"
-                >显示/隐藏搜索栏</el-button
+              >显示/隐藏搜索栏
+              </el-button
               >
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置</el-button
+              >重置
+              </el-button
               >
               <el-button type="primary" icon="el-icon-search" @click="submit"
-                >查询</el-button
+              >查询
+              </el-button
               >
               <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportUdi"
-                >选入DI信息</el-button
+              >选入DI信息
+              </el-button
               >
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportErp"
-                >添加院内字典</el-button
+              >添加院内字典
+              </el-button
               >
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentDetail"
-                >关联添加</el-button
+              >关联添加
+              </el-button
               >
             </el-button-group>
           </div>
@@ -288,27 +294,27 @@
                   size="small"
                   :disabled="scope.row.originUuid != null"
                   @click.native.stop="intentSelectUdi(scope.row)"
-                  >关联DI
+                >关联DI
                 </el-button>
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="handleModifyClick(scope.row)"
-                  >详情
+                >详情
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="diEdit(scope.row)"
-                  >编辑
+                >编辑
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="deleteDialog(scope.row)"
-                  >删除
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -917,7 +923,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -938,7 +944,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -961,7 +967,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -982,7 +988,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1005,7 +1011,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1026,7 +1032,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1049,7 +1055,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1070,7 +1076,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1243,7 +1249,7 @@
                             size="small"
                             @click.native.stop="selectVersion()"
                             style="margin-left: 5%"
-                            >切换版本
+                          >切换版本
                           </el-button>
                         </div>
                       </el-col>
@@ -1279,14 +1285,14 @@
                 size="small"
                 icon="search"
                 @click="onAddSubmit(false)"
-                >提交
+              >提交
               </el-button>
               <el-button
                 type="primary"
                 size="small"
                 icon="search"
                 @click="cancelDialog"
-                >取消
+              >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1308,14 +1314,14 @@
                 size="small"
                 icon="search"
                 @click="onAddSingleSubmit(false)"
-                >提交
+              >提交
               </el-button>
               <el-button
                 type="primary"
                 size="small"
                 icon="search"
                 @click="cancelDialog"
-                >取消
+              >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1460,7 +1466,7 @@ import {
   selectSysParamByKey,
   finProductSet,
 } from "@/api/param/systemParamConfig";
-import { filterByUuid } from "@/api/basic/product/udiInfo";
+import {filterByUuid} from "@/api/basic/product/udiInfo";
 
 import selectUdi from "./UdiInfoSelectRel.vue";
 import selectErp from "./udiInfoselectErpUdi";
@@ -1471,7 +1477,7 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import productUdiType from "@/views/basic/product/productUdiType";
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
-import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
+import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
 
 export default {
   data() {
@@ -1567,7 +1573,7 @@ export default {
       selectVersionVisible: false,
       selectLocalVisible: false, //关联UDI
       isUseDyCheck: false,
-      lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
+      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
       activeNames: ["1"],
       useNumEnable: true,
     };
@@ -1697,7 +1703,8 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     deleteDialog(rowId) {
@@ -1709,7 +1716,8 @@ export default {
         .then(() => {
           this.deleteOrders(rowId);
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentDetail() {
@@ -1747,9 +1755,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     removeDi() {
@@ -1776,9 +1786,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentSelectErp(val) {
@@ -1975,7 +1987,7 @@ export default {
           if (response.code == 20000) {
             this.getList();
             this.cancelDialog();
-            this.editDialogVisible = false;
+            this.editDiDialogVisible = false;
           } else {
             this.$message.error(response.message);
           }
@@ -2064,7 +2076,8 @@ export default {
           var invlist = response.data || [];
           this.treeList = this.handleTree(invlist, "code", "parentCode");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     addHospProduct(data) {
@@ -2095,7 +2108,8 @@ export default {
       this.getList();
     },
   },
-  mounted() {},
+  mounted() {
+  },
   components: {
     ProductSingleEdit,
     ProductEdit,
@@ -2121,15 +2135,18 @@ export default {
   margin-left: 0px;
   height: 30px;
 }
+
 .tree {
   ::v-deep .el-tree-node {
     white-space: normal;
+
     .el-tree-node__content {
       height: 100%;
       align-items: start;
     }
   }
 }
+
 .itemTag {
   float: left;
   text-align: right;
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index eec149d4..95f251e7 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -132,7 +132,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
+        <el-table-column label="操作" width="220" fixed="right">
           <template slot-scope="scope">
 
             <el-button
@@ -142,6 +142,14 @@
             >打印
             </el-button
             >
+            <el-button
+              type="text"
+              size="small"
+              @click.native="printOrderDetailPDF(scope.row)"
+            >报表打印
+            </el-button
+            >
+
             <el-button
               type="text"
               size="small"
@@ -522,7 +530,11 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import NewAcceptOrder from "@/views/inout/DialogNewReviewOrder";
-import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import {
+  inspectionOrderPDFFromStatemenTemplateFile,
+  inspectionOrderPDFFromTemplateFile, orderPDFFromStatemenTemplateFile,
+  orderPDFFromTemplateFile
+} from "@/api/itextpdf/orderPrint"
 
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {previewImage} from '@/api/purchase/supCompany'
@@ -812,6 +824,39 @@ export default {
         this.loading = false;
       });
     },
+
+    printOrderDetailPDF(row) {
+      let tQuery = {
+        labelId: 5,
+        orderIdFk: row.billNo
+      };
+      this.loading = true;
+      inspectionOrderPDFFromStatemenTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          orderPDFFromStatemenTemplateFile(tQuery).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+            this.getOrderQRCodeTextList();
+          }).catch(() => {
+            this.loading = false;
+          });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+
+
     getBusType() {
       let query = {
         code: this.filterQuery.invCode,
diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue
index 32219aaf..2fa9ec73 100644
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@@ -136,6 +136,7 @@ export default {
         key: null,
         paramStatus: 1,
         page: 1,
+        paramType: 0,
         limit: 20,
       },
       list: [],
diff --git a/vue.config.js b/vue.config.js
index 83259da2..279d8364 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:9991`,
+        target: process.env.VUE_APP_BASE_API,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",