Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/index.html

@@ -11,8 +11,10 @@
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <!-- 强制Chromium内核，作用于其他双核浏览器 -->
   <meta name="force-rendering" content="webkit" />
-  <!-- 自动将HTTP请求升级成安全的HTTPS请求 -->
+  <% if (process.env.NODE_ENV === 'production') { %>
+    <!-- 自动将HTTP请求升级成安全的HTTPS请求 -->
   <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+  <% } %>
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核，否则强制本机支持的最高版本IE内核，作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />

src/notification.js

@@ -8,7 +8,7 @@ export default {
   // 初始化
   init (vue, sessionId) {
     this.vue = vue;
-    this.url = `${process.env.VUE_APP_BASE_API}/ws`
+    this.url = `${process.env.VUE_APP_BASE_API}/wss`
     this.sessionId = sessionId;
 
     this.sock = undefined;

src/views/houseSelfCollect/inspectionManagement.vue

@@ -144,7 +144,7 @@ export default {
     }
   },
   activated() {
-    this.getList()
+    this.selectWarehouse()
   },
   methods: {
     find() {
@@ -214,8 +214,8 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      selectWarehouseSelf({
+    selectWarehouse(){
+       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
         personCharge: sessionStorage.getItem('ws-pf_staffName'),
       })
@@ -237,9 +237,14 @@ export default {
             this.warehouseNo =  this.warehouseList[0].No
             this.cangid =  this.warehouseList[0].id
             this.purchasePriceList =  this.warehouseList[0].purchasePriceList
+            this.getList()
           }
         })
 
+    },
+    getList() {
+     
+
       getinspectList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,

src/views/houseSelfCollect/weighingManagement.vue

@@ -159,7 +159,8 @@ export default {
     }
   },
   activated() {
-    this.getList()
+    this.selectWarehouse()
+   
   },
   methods: {
     print(row) {
@@ -223,7 +224,7 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
+    selectWarehouse(){
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
         personCharge: sessionStorage.getItem('ws-pf_staffName'),
@@ -241,8 +242,12 @@ export default {
           this.warehouseName = this.warehouseList[0].value
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
+         this.getList()
+          
         })
-      getweighingList({
+    },
+    getList() {
+          getweighingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -251,16 +256,13 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // this.$notify.success({
-          //   title: '成功',
-          //   message: '删除成功',
-          // })
           this.weighingList = response.records
           this.deptBudgetTotal = response.total
         })
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
         })
+      
     },
   },
 }