临床出库选择患者信息问题，设备打印问题

.env.production

@@ -37,10 +37,10 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
-VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
 
 
 # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'

src/api/basic/sicker/skPersonApi.js

@@ -9,6 +9,15 @@ export function page(query) {
   });
 }
 
+export function filterNoPage(query) {
+  return axios({
+    url: "/udiwms/basic/sk/sicker/filter/noPage",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function downloadSick(query) {
   return axios({
     url: "/udiwms/basic/sk/sicker/download",

src/api/dev/deviceInfoApi.js

@@ -77,3 +77,14 @@ export function genDeviceQR(deviceCode) {
   )
 }
 
+export function printDevLabel(query) {
+  return axios({
+    url: "/udiwms/inv/deptDevice/printOrder",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
+
+

src/views/basic/product/product.vue

@@ -423,15 +423,9 @@
               </template>
             </el-table-column>
             <el-table-column :width="isChoose?50:180" label="操作" fixed="right">
-              <template slot-scope="scope" v-if="isChoose">
-                <el-button
-                    type="text"
-                    size="small"
-                    @click.native.stop="chooseFunc(scope.row)"
-                >选择
-                </el-button>
-              </template>
-              <template slot-scope="scope" v-else>
+
+              <template slot-scope="scope">
+                <div v-if="!isChoose">
                   <el-button
                     type="text"
                     size="small" v-if="vueRouteSource==1"
@@ -445,8 +439,6 @@
                     @click.native.stop="handleModifyClick(scope.row)"
                   >详情
                   </el-button>
-
-
                   <el-button
                     type="text"
                     size="small" v-if="vueRouteSource==1"
@@ -474,7 +466,21 @@
                     @click.native.stop="uploadMsg(scope.row)"
                   >上传日志
                   </el-button>
+                </div>
+                <div v-else-if="isChoose">
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click.native.stop="chooseFunc(scope.row)"
+                  >选择
+                  </el-button>
+                </div>
               </template>
+
+<!--              <template slot-scope="scope" >-->
+
+              <!--              </template>-->
+
             </el-table-column>
           </el-table>
           <el-dialog
@@ -1641,7 +1647,7 @@ import {postThirdProduct} from "@/api/thrsys/thrProductsExport";
 
 export default {
   name: "prodcut",
-  props: {isChoose: {required: false, default: false, type: Boolean},chooseFunc: {required:false,type: Function}},
+  props: {isChoose: {required: false, default: false, type: Boolean}, chooseFunc: {required: false, type: Function}},
   data() {
     return {
       Dictionary: false, //物资字典分类显示、隐藏
@@ -1759,6 +1765,7 @@ export default {
       activeNames: ["1"],
       useNumEnable: true,
       vueRouteSource: 1,    //路由来源 1:耗材字典：2：第三方产品信息上传
+      isSelect: false,
     };
   },
   filters: {
@@ -2342,6 +2349,9 @@ export default {
     selectUnBindHospProduct,
   },
   created() {
+    // debugger
+    // if (this.isChoose != null)
+    //   this.isSelect = this.isChoose;
     this.vueRouteSource = this.$route.query.vueRouteSource;
     this.findBasicProductSet();
     this.getList();

src/views/basic/sicker/skPerson.js

@@ -146,7 +146,7 @@ export default {
 
     updatePrecribe() {
       this.updatePrecribeLoading = true;
-      downloadPrescribe({sickCode: this.sickerInfo.code}).then(res => {
+      downloadPrescribe({sickCode: this.sickerInfo.code,adNum:this.sickerInfo.adNum}).then(res => {
         this.updatePrecribeLoading = false
         if (res.code != 20000) {
           this.$message.error(res.message)

src/views/dev/deviceInfo.vue

@@ -59,7 +59,7 @@
         </el-table-column>
         <el-table-column label="巡检锁定" width="120">
           <template scope="scope">
-            <el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否'}}</el-tag>
+            <el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="数量" width="120" prop="count"/>
@@ -127,7 +127,7 @@
         </el-table-column>
         <el-table-column label="巡检锁定" width="120">
           <template scope="scope">
-            <el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否'}}</el-tag>
+            <el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="变更次数" width="100" prop="changeCount"/>
@@ -161,10 +161,18 @@
               >设备码
               </el-button>
             </el-popover>
-            <el-button v-if="isChoose&&scope.row.status==deviceStatus.NORMAL.key&&scope.row.checkLock==false" type="text"
+            <el-button v-if="isChoose&&scope.row.status==deviceStatus.NORMAL.key&&scope.row.checkLock==false"
+                       type="text"
                        @click="chooseFunc(scope.row)"
             >选择
             </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="printDevLabel(scope.row)"
+            >打印
+            </el-button>
+
           </template>
         </el-table-column>
       </el-table>

src/views/dev/js/deviceInfo.js

@@ -1,6 +1,7 @@
-import {detailByUserPage, deviceLogs, devicePage, genDeviceQR} from "@/api/dev/deviceInfoApi";
+import {detailByUserPage, deviceLogs, devicePage, genDeviceQR, printDevLabel} from "@/api/dev/deviceInfoApi";
 import {deviceChangeStatus, deviceChangeType, deviceStatus} from "@/utils/enum";
 import {downloadBase64Image} from "@/utils";
+import {stockQRCodeTextPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
 
 let query = {
   page: 1,
@@ -129,6 +130,27 @@ export default {
       }).catch(e => {
         this.loading = false
       })
+    },
+    printDevLabel(row) {
+      let tQuery = {
+        labelId: 5,
+        deviceCode: row.deviceCode
+      };
+
+      printDevLabel(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。
+      }).catch(() => {
+        this.loading = false;
+      });
     }
+
   }
 }

src/views/inout/DialogCreateOrder.vue

@@ -631,7 +631,7 @@ import selectRlDialog from "./DialogSelectRl";
 import DialogSelectSpace from "./DialogSelectSpace";
 import {isBlank} from "@/utils/strUtil";
 import {getDetailBizs} from "@/api/inout/orderDetailCode";
-import {page} from "@/api/basic/sicker/skPersonApi";
+import {filterNoPage, page} from "@/api/basic/sicker/skPersonApi";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 export default {
@@ -958,7 +958,7 @@ export default {
         limit: 10,
         key: key,
       };
-      page(sickQuery).then(res => {
+      filterNoPage(sickQuery).then(res => {
         this.fromSickOptions = res.data.list || []
       }).catch(() => {
       });