领用相关问题修改

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

src/store/modules/permission.js

@@ -123,11 +123,11 @@ export function filterDynamicRoutes(routes) {
 
 export const loadView = (view) => {
   if (process.env.NODE_ENV === 'development') {
-    return (resolve) => require([`@/views/${view}.vue`], resolve)
+    return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
 //    return () => import(`@/views/${view}`)
-    return (resolve) => require([`@/views/${view}.vue`], resolve)
+    return (resolve) => require([`@/views/${view}`], resolve)
   }
 }
 

src/views/inout/receive/receiveAdd.vue

@@ -88,7 +88,8 @@
 
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @current-change="handleDetail"
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border
+                @current-change="handleDetail"
                 :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="领用单号" prop="billNo"></el-table-column>
@@ -107,7 +108,12 @@
         <!--        <el-table-column label="领用类型" prop="billType"></el-table-column>-->
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" :disabled="scope.row.status==3  " @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.status==3  "
+                       @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            </el-button>
+            <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
+            >打印
+            </el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -160,7 +166,7 @@ import {delReceive} from "@/api/thrsys/thrOrderReceive";
 import {filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./DialogNewReceive";
-import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
 import {getBusChange} from "@/api/basic/busTypeChange";
 import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
@@ -400,6 +406,22 @@ export default {
         .catch(() => {
         });
     },
+    printOrder(row) {
+      printOrder(row)
+        .then((response) => {
+          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.getList();
+        })
+        .catch(() => {
+        });
+    },
     finCorpList(val) {
       let query = {
         name: val,

src/views/inout/receive/receiveAudit.vue

@@ -9,8 +9,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="当前仓库:">
+            <el-form-item label="领用仓库:">
-              <el-select v-model="filterQuery.targetInvCode" placeholder="请选择当前仓库" style="width: 100%;">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库"
+                         filterable
+                         clearable
+                         remote
+                         reserve-keyword
+                         :remote-method="finCurInv"
+                         style="width: 100%;">
                 <el-option
                   v-for="item in invList"
                   :key="item.code"
@@ -89,7 +95,7 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="领用单号" prop="billNo"></el-table-column>
         <el-table-column label="领用部门" prop="deptName"></el-table-column>
-        <el-table-column label="当前仓库" prop="invName"></el-table-column>
+        <el-table-column label="领用仓库" prop="invName"></el-table-column>
         <!--<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>-->
         <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
@@ -106,6 +112,9 @@
                        @click.native.stop="auditDialog(scope.row)"
             >审核
             </el-button>
+            <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
+            >打印
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -149,7 +158,7 @@
 </template>
 <script>
 
-import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
 import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
@@ -244,7 +253,7 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
-        targetInvCode: this.invCodebe,
+        targetInvCode: null,
         type: 2,
         editStatus: 2,
       };
@@ -272,8 +281,22 @@ export default {
       this.filterQuery.orderBy = column.prop;
       this.getList();
     },
-
+    printOrder(row) {
-
+      printOrder(row)
+        .then((response) => {
+          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.getList();
+        })
+        .catch(() => {
+        });
+    },
     getList() {
 
       if (this.actDateRange != null) {
@@ -338,7 +361,7 @@ export default {
         });
     },
 
-    finCurInv() {
+    finCurInv(keyWord) {
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -349,23 +372,24 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
-        targetInvCode: this.invCodebe,
+        targetInvCode: null,
         type: 2,
         editStatus: 2,
       };
 
       this.invList = [];
       let query = {
-        filter: 3
+        filter: 3,
+        name: keyWord,
       };
       findInvByUser(query)
         .then((response) => {
           this.invList = response.data || [];
-          if (this.invList.length > 0) {
+          // if (this.invList.length > 0) {
-            this.filterQuery.targetInvCode = this.invList[0].code
+          //   this.filterQuery.targetInvCode = this.invList[0].code
-            this.invCodebe = this.filterQuery.targetInvCode
+          //   this.invCodebe = this.filterQuery.targetInvCode
-          }
+          // }
-          this.getList();
+          // this.getList();
         })
         .catch(() => {
         });

src/views/inout/receive/receiveSearch.vue

@@ -10,7 +10,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="领用仓库:">
-              <el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 90%;">
+              <el-select v-model="filterQuery.targetInvCode"
+                         filterable
+                         clearable
+                         remote
+                         reserve-keyword
+                         :remote-method="finCurInv"
+                         placeholder="请选择领用仓库" style="width: 90%;">
                 <el-option
                   v-for="item in invList"
                   :key="item.code"
@@ -416,19 +422,20 @@ export default {
         });
     },
 
-    finCurInv() {
+    finCurInv(keyWord) {
       this.invList = [];
       let query = {
+        name: keyWord,
         filter: 3
       };
       findInvByUser(query)
         .then((response) => {
           this.invList = response.data || [];
-          if (this.invList.length > 0) {
+          // if (this.invList.length > 0) {
-            this.filterQuery.targetInvCode = this.invList[0].code
+          //   this.filterQuery.targetInvCode = this.invList[0].code
-            this.invCodebe = this.filterQuery.targetInvCode
+          //   this.invCodebe = this.filterQuery.targetInvCode
-          }
+          // }
-          this.getList();
+          // this.getList();
         })
         .catch(() => {
         });