Merge branch 'feature/Feature-copy' into develop

src/api/stock.js

@@ -63,3 +63,23 @@ export function getListStockToDay(params) {
     params
   })
 }
+
+//库存到货访问通知-列表
+export function getNoticeList(params) {
+  return request({
+    url: '/stock/visit/list',
+    method: 'get',
+    params
+  })
+}
+
+
+
+//库存到货访问通知-数量
+export function getNoticeNum(params) {
+  return request({
+    url: '/stock/visit/count',
+    method: 'get',
+    params
+  })
+}

src/layout/components/Navbar.vue

@@ -68,14 +68,14 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="到货通知" :modal="false" :visible.sync="hasNotice" center @close="handleNotice">
-      <el-table :data="[]">
-        <el-table-column property="date" label="产品编号" ></el-table-column>
-        <el-table-column property="name" label="物料编码" ></el-table-column>
-        <el-table-column property="address" label="产品名称"></el-table-column>
-        <el-table-column property="address" label="规格型号"></el-table-column>
-        <el-table-column property="address" label="到货仓库"></el-table-column>
-        <el-table-column property="address" label="到货通知时间"></el-table-column>
+    <el-dialog title="到货通知" :modal="false" :visible.sync="hasNotice" center @close="handleNotice(false)">
+      <el-table :data="noticeList" v-loading="listLoading">
+        <el-table-column property="materialOldNumber" label="产品编号" ></el-table-column>
+        <el-table-column property="materialNumber" label="物料编码" ></el-table-column>
+        <el-table-column property="materialName" label="产品名称"></el-table-column>
+        <el-table-column property="specification" label="规格型号"></el-table-column>
+        <el-table-column property="stockName" label="到货仓库"></el-table-column>
+        <el-table-column property="updateTime" label="到货通知时间"></el-table-column>
       </el-table>
       <div class="flex">
         <div></div>
@@ -151,6 +151,7 @@ import Hamburger from "@/components/Hamburger";
 import Screenfull from "@/components/Screenfull";
 import NavMenu from "@/components/NavMenu";
 import { getNoticeListCount } from "@/api/notice";
+import {getNoticeList} from '@/api/stock'
 import { bindEngineAccount, checkEngineAccount } from "@/api/setting";
 import mixin from '@/mixin'
 export default {
@@ -180,6 +181,7 @@ export default {
       wsConnectErrorTime: 1,
       websock: null,
       lockReconnect: false,
+      noticeList:[]
     };
   },
   mounted() {
@@ -233,9 +235,24 @@ export default {
   },
   methods: {
     getList(){
+      this.getNoticeList()
     }
     ,
-    handleNotice(){
+    getNoticeList(){
+      this.listLoading = true
+      getNoticeList({
+        pageNum:this.currentPage,
+        pageSize:this.pageSize
+      }).then(res=>{
+        this.noticeList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
+    },
+    handleNotice(flag=true){
+      if (flag) {
+        this.getNoticeList()
+      }
       this.$store.commit("user/SET_STATUS",!this.hasNotice);
     },
     toggleSideBar() {

src/mixin/index.js

@@ -23,7 +23,6 @@ export default {
     }
   },
   created() {
-    console.log('缓存了');
     this.getList();
   },
   methods: {

src/views/sales_policy/components/AddPolicy.vue

@@ -153,6 +153,7 @@
             </el-row>
             <el-divider />
           </el-row>
+          <!-- v-el-select-loadmore="loadmore2" -->
           <el-table
             v-loading="listLoading"
             :data="dataList"
@@ -162,7 +163,6 @@
             fit
             highlight-current-row
             stripe
-            v-el-select-loadmore="loadmore2"
 
           >
             <el-table-column
@@ -650,7 +650,7 @@ export default {
         let total = Math.floor(this.listTotal/10)
           if (this.dcurrentPage<=total) {
             this.dcurrentPage++
-           this.handletwoList()
+             this.handletwoList()
           }
         }
     },
@@ -850,8 +850,8 @@ export default {
       this.listLoading = true;
 
       const paramss = {
-        pageNum: this.dcurrentPage,
-        pageSize: 10,
+        pageNum: 1,
+        pageSize: -1,
         policyId: this.comCode,
         saleTypeCode: "",
       };
@@ -1019,10 +1019,13 @@ export default {
         }
       }
 
+
       savePolicy(this.dataList).then((res) => {
         this.dataList = [];
+        this.dcurrentPage = 1
         this.sleectBox.currentPage = 1;
         this.$successMsg("保存成功");
+
         this.handletwoList();
       });
     },

src/views/sales_policy/components/editPolicy.vue

@@ -145,6 +145,7 @@
             <el-divider />
           </el-row>
           <div class="table">
+            <!-- v-el-select-loadmore="loadmore2" -->
           <el-table
             v-loading="listLoading"
             :data="dataList"
@@ -154,7 +155,7 @@
             fit
             highlight-current-row
             stripe
-            v-el-select-loadmore="loadmore2"
+
           >
             <el-table-column
               type="index"
@@ -875,8 +876,8 @@ export default {
       // this.searchForm.type
       this.listLoading = true
       const paramss = {
-        pageNum: this.dcurrentPage,
-        pageSize: 10,
+        pageNum: 1,
+        pageSize: -1,
          policyId: this.searchForm.code,
         saleTypeCode: ''
       }